[智价云] 店铺查询更新

app/Http/Controllers/Manager/WashConfig/ViolationStore.php

@@ -55,33 +55,40 @@ class ViolationStore extends Controller
         if (!empty($employee_name)) {
             $employee_name_ids = $EmployeeModel->where('name', 'like', "%$employee_name%")->pluck('id')->toArray();
             if (!empty($employee_name_ids)) {
-                foreach ($employee_name_ids as $employee_name_id) {
-                    if (empty($employee_name_id) || $employee_name_id == '') continue;
-                    $ViolationStoreModel = $ViolationStoreModel
-                        ->whereRaw("FIND_IN_SET(?, employee_ids)", [$employee_name_id]);
-                }
+                $ViolationStoreModel = $ViolationStoreModel->where(function($query) use ($employee_name_ids) {
+                    foreach ($employee_name_ids as $employee_name_id) {
+                        if (empty($employee_name_id) || $employee_name_id == '') continue;
+                        $query->orWhereRaw("FIND_IN_SET(?, employee_ids)", [$employee_name_id]);
+                    }
+                });
             }
         }
+
         if (!empty($platforms) && $platforms != '') {
             $platforms = explode(',', $platforms);
-            foreach ($platforms as $platform) {
-                if(empty($platform) || $platform == '') continue;
-                $ViolationStoreModel = $ViolationStoreModel
-                    ->whereRaw("FIND_IN_SET(?, platform)", [$platform]);
-            }
+            $ViolationStoreModel = $ViolationStoreModel->where(function($query) use ($platforms) {
+                foreach ($platforms as $platform) {
+                    if(empty($platform) || $platform == '') continue;
+                    $query->orWhereRaw("FIND_IN_SET(?, platform)", [$platform]);
+                }
+            });
         }
+
         if (!empty($employee_ids) && $employee_ids != '') {
-            $employee_ids = explode(',', $employee_ids);    
-            foreach ($employee_ids as $employee_id) {
-                if(empty($employee_id) || $employee_id == '') continue;
-                $ViolationStoreModel = $ViolationStoreModel
-                    ->whereRaw("FIND_IN_SET(?, employee_ids)", [$employee_id]);
-            }
+            $employee_ids = explode(',', $employee_ids);
+            $ViolationStoreModel = $ViolationStoreModel->where(function($query) use ($employee_ids) {
+                foreach ($employee_ids as $employee_id) {
+                    if(empty($employee_id) || $employee_id == '') continue;
+                    $query->orWhereRaw("FIND_IN_SET(?, employee_ids)", [$employee_id]);
+                }
+            });
         }
+
         $result = $ViolationStoreModel
             ->where($map)
             ->orderByDesc('id')
-            ->paginate($limit)->toarray();
+            ->paginate($limit)
+            ->toarray();
         // 分配数据
         if (!$result)  return json_send(['code' => 'success', 'msg' => '获取成功', 'data' => []]);
         if (isset($result['data']) && count($result['data']) > 0) {