|
|
@@ -100,8 +100,8 @@ class ItemService extends Service
|
|
|
'item_node_mission' => ['id','code', 'title', 'start_time', 'end_time', 'charge_id', 'state', 'progress', 'crt_id'],
|
|
|
];
|
|
|
$search = [
|
|
|
- 'item' => "(id = {$data['id']})",
|
|
|
- 'item_node' => "(id = {$data['id']})",
|
|
|
+ 'item' => "(item_id = {$data['id']})",
|
|
|
+ 'item_node' => "(item_node_id = {$data['id']})",
|
|
|
'item_node_mission' => "(parent_item_node_mission_id = {$data['id']})",
|
|
|
];
|
|
|
$next_type = [
|
|
|
@@ -109,7 +109,6 @@ class ItemService extends Service
|
|
|
'item_node' => 'item_node_mission',
|
|
|
'item_node_mission' => 'item_node_mission',
|
|
|
];
|
|
|
- $data['type'] = $next_type[$data['type']];
|
|
|
if (empty($data['type']) && ! isset($type[$data['type']])) return [false , '类型错误'];
|
|
|
$class = $type[$data['type']];
|
|
|
$select = $field[$data['type']];
|
|
|
@@ -121,6 +120,7 @@ class ItemService extends Service
|
|
|
->orderby('id', 'desc')
|
|
|
->get()->toArray();
|
|
|
|
|
|
+ $data['type'] = $next_type[$data['type']];
|
|
|
$list = $this->fillItemGannetList($list, $data);
|
|
|
|
|
|
return [true, $list];
|
