|
@@ -1794,11 +1794,20 @@ class ItemService extends Service
|
|
|
public function itemNodeMissionCommon($data,$user, $field = []){
|
|
public function itemNodeMissionCommon($data,$user, $field = []){
|
|
|
if(empty($field)) $field = ItemNodeMission::$field;
|
|
if(empty($field)) $field = ItemNodeMission::$field;
|
|
|
|
|
|
|
|
|
|
+ $item_id = $data['item_id'] ?? 0;
|
|
|
|
|
+ $item_node_id = $data['item_node_id'] ?? 0;
|
|
|
$model = ItemNodeMission::TopAndEmployeeClear($user,$data);
|
|
$model = ItemNodeMission::TopAndEmployeeClear($user,$data);
|
|
|
$model = $model->where('del_time',0)
|
|
$model = $model->where('del_time',0)
|
|
|
|
|
+ ->when(! empty($item_id),function ($query) use($item_id){
|
|
|
|
|
+ return $query->where('item_id', $item_id);
|
|
|
|
|
+ })
|
|
|
|
|
+ ->when(! empty($item_node_id),function ($query) use($item_node_id){
|
|
|
|
|
+ return $query->where('item_node_id', $item_node_id);
|
|
|
|
|
+ })
|
|
|
->select($field)
|
|
->select($field)
|
|
|
->orderby('id', 'desc');
|
|
->orderby('id', 'desc');
|
|
|
|
|
|
|
|
|
|
+
|
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
if(! empty($data['title'])) $model->where('title', 'LIKE', '%'.$data['title'].'%');
|
|
|
if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
|
|
if(! empty($data['code'])) $model->where('code', 'LIKE', '%'.$data['code'].'%');
|
|
|
if(! empty($data['id'])) $model->whereIn('id', $data['id']);
|
|
if(! empty($data['id'])) $model->whereIn('id', $data['id']);
|