From 02f5c6d17ffd6075f766cca5273a9846ac3c25e9 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Wed, 29 Jul 2020 20:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=AA=8C=E8=AF=81=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Controller/ServiceEvaluateController.php | 7 ++++++-
 app/Request/UserRequest.php                  | 3 +--
 app/Service/ServiceEvaluateService.php       | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/Controller/ServiceEvaluateController.php b/app/Controller/ServiceEvaluateController.php
index 3ab7f96..e1947ef 100644
--- a/app/Controller/ServiceEvaluateController.php
+++ b/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','','服务专员不存在或被禁用');
+        }
     }
 
     /**
diff --git a/app/Request/UserRequest.php b/app/Request/UserRequest.php
index da2e561..2eed8d4 100644
--- a/app/Request/UserRequest.php
+++ b/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信息不正确',
         ];
     }
diff --git a/app/Service/ServiceEvaluateService.php b/app/Service/ServiceEvaluateService.php
index 28313d9..040917d 100644
--- a/app/Service/ServiceEvaluateService.php
+++ b/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;
     }