[智价云] 员工地区展示更新

app/Http/Controllers/Manager/Personnel/Employee.php

@@ -51,6 +51,7 @@ class Employee extends Controller
         $role_ids = [];
         $city_ids = request('city_ids', '');
         $department_ids = request('department_ids', '');
+        $EmployeeModel_Area = new EmployeeModel();
         // 时间条件
         if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
         if ($end_time) $map[]   = ['insert_time', '<=', strtotime($end_time)];
@@ -131,7 +132,7 @@ class Employee extends Controller
                 $result['data'][$key]['department_ids'] = $value['department_ids'] != '' ? substr($value['department_ids'], 1, strlen($value['department_ids']) - 2) : '';
                 $result['data'][$key]['department_name'] = $department_name;
                 $result['data'][$key]['role_name'] = isset($role_info['name']) ? $role_info['name'] : '';
-                $result['data'][$key]['area_info'] = $EmployeeModel->get_area_info($value['id']);
+                $result['data'][$key]['area_info'] = $EmployeeModel_Area->get_area_info($value['id']);
             }
         }
         // 加载模板

app/Models/Manager/Personnel/Employee.php

@@ -66,26 +66,27 @@ class Employee extends Model
      */
     public function get_area_info($uid)
     {
-        $user_area_info = '';
         //获取用户关联大区信息
         $EmployeeZoningModel = new EmployeeZoningModel();
         $EmployeeProvinceModel = new EmployeeProvinceModel();
         $EmployeeAreaModel = new EmployeeAreaModel();
         $user_area_info = $EmployeeZoningModel->where('employee_id', $uid)->get()->toArray();
-        if ($user_area_info) {
-            //查询用户关联省份信息
-            foreach ($user_area_info as $key => $value) {
-                $province_info = $EmployeeProvinceModel->where(['employee_id' => $uid, 'zoning_id' => $value['zoning_id']])->get()->toArray();
-                $user_area_info[$key]['province_info'] = '';
-                if (empty($province_info)) continue;
-                $user_area_info[$key]['province_info'] = $province_info;
-                //查询用户关联城市信息
-                foreach ($province_info as $k => $v) {
-                    $city_info = $EmployeeAreaModel->where(['employee_id' => $uid, 'province_id' => $v['province_id']])->get()->toArray();
-                    $user_area_info[$key]['province_info'][$k]['city_info'] = '';
-                    if (empty($city_info)) continue;
-                    $user_area_info[$key]['province_info'][$k]['city_info'] = $city_info;
-                }
+        if (!$user_area_info) {
+            return $user_area_info;
+        }
+
+        //查询用户关联省份信息
+        foreach ($user_area_info as $key => $value) {
+            $province_info = $EmployeeProvinceModel->where(['employee_id' => $uid, 'zoning_id' => $value['zoning_id']])->get()->toArray();
+            $user_area_info[$key]['province_info'] = '';
+            if (empty($province_info)) continue;
+            $user_area_info[$key]['province_info'] = $province_info;
+            //查询用户关联城市信息
+            foreach ($province_info as $k => $v) {
+                $city_info = $EmployeeAreaModel->where(['employee_id' => $uid, 'province_id' => $v['province_id']])->get()->toArray();
+                $user_area_info[$key]['province_info'][$k]['city_info'] = '';
+                if (empty($city_info)) continue;
+                $user_area_info[$key]['province_info'][$k]['city_info'] = $city_info;
             }
         }
         return $user_area_info;