|
|
@@ -549,10 +549,18 @@ class U8XkyServerService extends Service
|
|
|
|
|
|
public function filedCommon($data, $user, $field = []){
|
|
|
$type = $data['type'] ?? null;
|
|
|
+ $name = $data['name'] ?? null;
|
|
|
$model = Field::where('login_type', $user['login_type'])
|
|
|
->when(! empty($type), function ($query) use($type){
|
|
|
return $query->where('type', $type);
|
|
|
})
|
|
|
+ ->when(! empty($name), function ($query) use($name, $user){
|
|
|
+ $id = DDEmployee::where('login_type', $user['login_type'])
|
|
|
+ ->where('name', 'like', '%' . $name . '%')
|
|
|
+ ->pluck('userid')
|
|
|
+ ->toArray();
|
|
|
+ return $query->whereIn('userid', $id);
|
|
|
+ })
|
|
|
->select('id','userid','type');
|
|
|
|
|
|
return $model;
|