From 1b79bd32a4686381f8fcf02215ec6f9541fa953d Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Mon, 27 Jul 2020 11:28:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BB=B7=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E5=9B=BE=E7=89=87=E5=92=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Request/PersonnelRequest.php       | 2 +-
 app/Service/ServiceEvaluateService.php | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/Request/PersonnelRequest.php b/app/Request/PersonnelRequest.php
index f4afee6..87aacb2 100644
--- a/app/Request/PersonnelRequest.php
+++ b/app/Request/PersonnelRequest.php
@@ -22,7 +22,7 @@ class PersonnelRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'service_personnel_id' => 'required|nonempty|integer|exists:ims_cjdc_user,id',
+            'service_personnel_id' => 'required|nonempty|integer|exists:lanzu_service_personnel,id',
         ];
     }
 
diff --git a/app/Service/ServiceEvaluateService.php b/app/Service/ServiceEvaluateService.php
index 13d26b3..d7cf885 100644
--- a/app/Service/ServiceEvaluateService.php
+++ b/app/Service/ServiceEvaluateService.php
@@ -40,8 +40,10 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
 
     public function getEvaluateList($service_personnel_id)
     {
-        $res = Db::table('lanzu_service_evaluate')
-            ->where(['service_personnel_id' => $service_personnel_id])
+        $res = Db::table('lanzu_service_evaluate as e')
+            ->join('ims_cjdc_user as u','u.id','=','e.user_id')
+            ->where(['e.service_personnel_id'=>$service_personnel_id])
+            ->select('e.*','u.name','u.img')
             ->paginate(4);
         return $res;
     }