From 86f52f1504fb9c5dad81807abf1734a663ff4ef2 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GG6FIN9\\Administrator" <15040771@qq.com>
Date: Mon, 27 Jul 2020 18:27:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E5=88=97=E8=A1=A8=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Service/ServiceEvaluateService.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Service/ServiceEvaluateService.php b/app/Service/ServiceEvaluateService.php
index c67e0d1..8089c9d 100644
--- a/app/Service/ServiceEvaluateService.php
+++ b/app/Service/ServiceEvaluateService.php
@@ -42,17 +42,22 @@ class ServiceEvaluateService implements ServiceEvaluateServiceInterface
                 ['status','=',1]
             ])
             ->first();
-        $personnel_average = Db::table('lanzu_service_evaluate')->where(['service_personnel_id'=>$service_personnel_id])->avg('c_average');
-        $res->personnel_average = sprintf("%.1f",$personnel_average);
+        //如果存在服务专员则计算评价平均分
+        if(!empty($res)) {
+            $personnel_average = Db::table('lanzu_service_evaluate')->where(['service_personnel_id' => $service_personnel_id])->avg('c_average');
+            $res->personnel_average = sprintf("%.1f", $personnel_average);
+        }
         return $res;
     }
 
     public function getEvaluateList($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')
+            ->orderBy('created_at','desc')
             ->paginate(4);
         return $res;
     }