|
@@ -467,8 +467,28 @@ class ApiService{
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- $result['list'] = $list;
|
|
|
|
|
-// $result['data']['pie'] = $pie;
|
|
|
|
|
|
|
+ $existingPersonIds = collect($list)->pluck('person_id')->toArray();
|
|
|
|
|
+
|
|
|
|
|
+ $zgry = DB::connection('mysql_fwe10')
|
|
|
|
|
+ ->table('uf_zhxx_qlczgry')
|
|
|
|
|
+ ->where('is_delete', 0)
|
|
|
|
|
+ ->whereNotIn('zgrgh', $existingPersonIds)
|
|
|
|
|
+ ->select('zgrxm', 'zgrgh', 'dwmc')
|
|
|
|
|
+ ->get();
|
|
|
|
|
+
|
|
|
|
|
+ $supplementList = collect($zgry)->map(function ($item) {
|
|
|
|
|
+ return [
|
|
|
|
|
+ "department" => $item->dwmc,
|
|
|
|
|
+ "lastname" => $item->zgrxm,
|
|
|
|
|
+ "person_id" => $item->zgrgh,
|
|
|
|
|
+ "count" => '无记录',
|
|
|
|
|
+ "sort" => '无排名'
|
|
|
|
|
+ ];
|
|
|
|
|
+ })->toArray();
|
|
|
|
|
+
|
|
|
|
|
+ $mergedList = array_merge($list, $supplementList);
|
|
|
|
|
+
|
|
|
|
|
+ $result['list'] = $mergedList;
|
|
|
|
|
|
|
|
return $result;
|
|
return $result;
|
|
|
}
|
|
}
|