Jelajahi Sumber

fix: 服务端修改提交

root 7 jam lalu
induk
melakukan
e4d7a46b67
1 mengubah file dengan 4 tambahan dan 3 penghapusan
  1. 4 3
      Modules/Admin/Http/Controllers/Api/ApiController.php

+ 4 - 3
Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -1322,7 +1322,7 @@ class ApiController extends BaseController
 
         $result['title'] = date('Y年n月j日', strtotime($riqi)).'值班信息';
 
-        $zbInfo = DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->where('riqi',$riqi)->orderBy('CREATE_TIME','desc')->first();
+        $zbInfo = DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->where('riqi',$riqi)->where('is_delete',0)->orderBy('CREATE_TIME','desc')->first();
 
         if (!$zbInfo) {
             return self::successResponse($result);
@@ -1391,6 +1391,7 @@ class ApiController extends BaseController
                 SELECT MAX(CREATE_TIME)
                 FROM uf_gggs_rygl as r2
                 WHERE r2.xm = r1.xm)')
+                ->where('is_delete',0)
                 ->get()
                 ->keyBy('xm');
             foreach ($peopleData as $person) {
@@ -1433,7 +1434,7 @@ class ApiController extends BaseController
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
 
-        $people = DB::connection('mysql_fwe10')->table('uf_gggs_rygl')->where('xm',$name)->orderBy('create_time','desc')->first();
+        $people = DB::connection('mysql_fwe10')->table('uf_gggs_rygl')->where('xm',$name)->where('is_delete',0)->orderBy('create_time','desc')->first();
 
         $mobile = '';
 
@@ -1448,7 +1449,7 @@ class ApiController extends BaseController
                 $subQuery->selectRaw('MAX(id)') // 获取每个日期的最大create_time对应的记录
                 ->from('uf_gggs_zbgl')
                     ->groupBy('riqi'); // 按riqi分组
-            })->orderBy('riqi')->get();
+            })->where('is_delete',0)->orderBy('riqi')->get();
 
         $data = [];