[智价云] 员工地区信息校验更新

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

@@ -305,7 +305,12 @@ class Employee extends Controller
      */
     public function add(Request $request, EmployeeModel $EmployeeModel)
     {
-        $request->scene('add')->validate();
+        $area_data = request('area_data', '');
+        if(!empty($area_data)){
+            $request->scene('add')->validate();
+        }else{
+            $request->scene('add_other')->validate();
+        }
         $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
@@ -373,7 +378,12 @@ class Employee extends Controller
      */
     public function edit(Request $request, EmployeeModel $EmployeeModel)
     {
-        $request->scene('edit')->validate();
+        $area_data = request('area_data', '');
+        if(!empty($area_data)){
+            $request->scene('edit')->validate();
+        }else{
+            $request->scene('edit_other')->validate();
+        }
         $admin_company_id = request('admin_company_id', '0');
         $company_id = request('access_token.company_id', '0');
         $is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否

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

@@ -74,6 +74,14 @@ class Employee extends BaseRequest
             'area_data.*.province_data.*.city_ids.*.id',
             'area_data.*.province_data.*.city_ids.*.name',
         ],
+        'add_other'                      => [
+            'name',
+            'mobile',
+            'department_ids',
+            'role_id',
+            'password',
+            'open_notice',
+        ],
         'edit'                  => [
             'id',
             'name',
@@ -93,6 +101,14 @@ class Employee extends BaseRequest
             'area_data.*.province_data.*.city_ids.*.id',
             'area_data.*.province_data.*.city_ids.*.name',
         ],
+        'edit_other'                  => [
+            'id',
+            'name',
+            'mobile',
+            'department_ids',
+            'role_id',
+            'open_notice',
+        ],
         'set_status'              => ['id', 'status'],
         'delete'                  => ['id'],
         'all'                    => [''],