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