|
|
@@ -2797,16 +2797,16 @@ class ItemService extends Service
|
|
|
})
|
|
|
->where('e.del_time', 0)
|
|
|
->when(! empty($item_id), function ($query) use($item_id){
|
|
|
- return $query->where('i.item_id', $item_id);
|
|
|
+ return $query->where('e.item_id', $item_id);
|
|
|
})
|
|
|
->when(! empty($item_node_id), function ($query) use($item_node_id){
|
|
|
- return $query->where('i.item_node_id', $item_node_id);
|
|
|
+ return $query->where('e.item_node_id', $item_node_id);
|
|
|
})
|
|
|
->when(! empty($item_node_mission_id), function ($query) use($item_node_mission_id){
|
|
|
- return $query->where('i.item_node_mission_id', $item_node_mission_id);
|
|
|
+ return $query->where('e.item_node_mission_id', $item_node_mission_id);
|
|
|
})
|
|
|
->when(! empty($employee_id), function ($query) use($employee_id){
|
|
|
- return $query->where('i.data_id', $employee_id);
|
|
|
+ return $query->where('e.data_id', $employee_id);
|
|
|
})
|
|
|
->select('e.*')
|
|
|
->orderby('e.id', 'desc');
|
