From a31aa3294caca2c74e5e39ca90e4e737fca99bf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B2=A9=E4=BB=9488?= <>
Date: Mon, 9 Mar 2026 23:25:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/Admin/YeWu/WorkMainController.php  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
index 127928a..dae7d44 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
@@ -112,8 +112,8 @@ class WorkMainController extends Controller
         $list=DB::table('s_list')
             ->leftJoin('s_period','s_list.reservation_time','=','s_period.id')
             ->leftJoin('s_department_resources','s_list.reservation_sources','=','s_department_resources.id')
-            ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name');
-
+            ->select('s_list.*','s_period.period_begin_time','s_period.period_end_time','s_department_resources.department_resources_name')
+            ->where(['s_list.is_del'=>0,'s_list.is_nullify'=>0]);
         if($userInfo[0]->group==2){
           //  $list=$list->whereIn('warddesc', explode(",", $userInfo[0]->ward));
             $list=$list->where(['wardcode'=> $department->department_number]);
@@ -157,7 +157,7 @@ class WorkMainController extends Controller
 
         $count = $list;
         $count = $count->count();
-        $list=$list->where(['s_list.is_del'=>0,'s_list.is_nullify'=>0])->orderBy('id', 'desc')->limit($pageSize)->skip(($page - 1) * $pageSize) // 跳过前9999条记录
+        $list=$list->orderBy('id', 'desc')->limit($pageSize)->skip(($page - 1) * $pageSize) // 跳过前9999条记录
         ->take($pageSize)->get();
 
         //匹配设备（服务组）