作者 lyh

变更数据

... ... @@ -61,11 +61,11 @@ class GeoLogic extends BaseLogic
}
//负责人集合
$geo_manage_list = $geoConfModel->geoManage();
// geo配置管理员,已经移除管理员列表,补充管理员信息
if ($geo_conf && isset($geo_conf['manager_id']) && empty($geo_manage_list[$geo_conf['manager_id']])) {
$manage = ManageHr::where(['id' => $geo_conf['manager_id']])->pluck('name', 'id')->toArray();
$geo_manage_list = array_merge($geo_manage_list, $manage);
}
// // geo配置管理员,已经移除管理员列表,补充管理员信息
// if ($geo_conf && isset($geo_conf['manager_id']) && empty($geo_manage_list[$geo_conf['manager_id']])) {
// $manage = ManageHr::where(['id' => $geo_conf['manager_id']])->pluck('name', 'id')->toArray();
// $geo_manage_list = array_merge($geo_manage_list, $manage);
// }
$result = [
'project_geo_conf' => $project_geo_conf,
'geo_conf' => $geo_conf,
... ...