Pārlūkot izejas kodu

添加网格化接口

qiuzijian 1 gadu atpakaļ
vecāks
revīzija
b44a6045ee
1 mainītis faili ar 2 papildinājumiem un 5 dzēšanām
  1. 2 5
      Modules/Admin/Services/ApiService.php

+ 2 - 5
Modules/Admin/Services/ApiService.php

@@ -190,7 +190,6 @@ class ApiService{
                    ->where('szxmc', $depart)->count();
 
         $data = [];
-        $count = 0;
         foreach ($query as $key => $val) {
             $detail = DB::connection('mysql_fwview')->table('uf_wghgl_new')
                     ->where('xjdw', $depart)
@@ -201,12 +200,10 @@ class ApiService{
                 $lastname = DB::connection('mysql_fwview')->table('hrmresource')
                             ->where('id', $val->lrr)->value('lastname');
 
-                $count = $count + 1;
-
                 $data[$val->lrr] = [
                     'department' => $val->dwmc,
                     'lastname'   => $lastname,
-                    'count'      => $count,
+                    'count'      => isset($data[$val->lrr]['count']) ? $data[$val->lrr]['count'] + 1 : 0,
                 ];
             } else {
                 continue;
@@ -214,7 +211,7 @@ class ApiService{
 
         }
 
-        $result['data'] = $data;
+        $result['data'] = array_column($data, 'count');
 
         return $result;
     }