Merge branch 'service_evaluate' into develop

app/Controller/ServiceEvaluateController.php

@@ -45,7 +45,12 @@ class ServiceEvaluateController extends BaseController
     {
         //根据用户iD 获取服务专员详细信息
         $user_id = $this->request->input('user_id', 0);
-        return $this->success($this->evaluateService->isPersonnel($user_id));;
+        $res = $this->evaluateService->isPersonnel($user_id);
+        if(isset($res->status) && $res->status == 1){
+            return $this->success($res);
+        }else{
+            return $this->result('900','','服务专员不存在或被禁用');
+        }
     }
 
     /**

app/Request/UserRequest.php

@@ -22,14 +22,13 @@ class UserRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'user_id' => 'required|nonempty|integer|exists:ims_cjdc_user,id|exists_enable:lanzu_service_personnel,user_id,status=1',
+            'user_id' => 'required|nonempty|integer|exists:ims_cjdc_user,id',
         ];
     }
 
     public function messages(): array
     {
         return [
-            'user_id.exists_enable' => '服务专员不存在或被禁用',
             'user_id.*' => ':attribute信息不正确',
         ];
     }

app/Service/ServiceEvaluateService.php

@@ -41,7 +41,7 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
             ->where([
                 ['user_id','=',$user_id],
             ])
-            ->select('id')
+            ->select('id','status')
             ->first();
         return $res;
     }