合并分支 'lyh-server' 到 'master'

变更数据



查看合并请求 !3116

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