From 380d9729fe5fd55adcea3feb285d39a0f5980c85 Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Tue, 28 Jun 2022 18:05:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=9C=80=E6=B1=82=E5=A4=A7=E5=8E=85=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ghy/web/controller/order/OrderMasterController.java | 6 +++---
 .../src/main/resources/mapper/order/OrderMasterMapper.xml   | 5 ++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
index 28f75822..b07db3c3 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderMasterController.java
@@ -102,7 +102,7 @@ public class OrderMasterController extends BaseController {
             List<OrderStandard> standardList = new ArrayList<>();
 
             // 师傅信息
-            Worker worker = workerService.selectById(master.getWorkerId());
+            Worker worker = master.getWorkerId() != null ? workerService.selectById(master.getWorkerId()) : null;
 
             // 消费者信息
             Customer customer = customerService.selectByCustomerId(master.getCustomerId());
@@ -135,8 +135,8 @@ public class OrderMasterController extends BaseController {
             orderListResponse.setDiscountMoney(financialMaster.getDiscountMoney());
             orderListResponse.setTotalMoney(financialMaster.getTotalMoney());
             orderListResponse.setPayMoney(financialMaster.getPayMoney());
-            orderListResponse.setWorkerName(worker.getName());
-            orderListResponse.setWorkerPhone(worker.getPhone());
+            orderListResponse.setWorkerName(worker == null ? "" : worker.getName());
+            orderListResponse.setWorkerPhone(worker == null ? "" : worker.getPhone());
             orderListResponse.setCustomerName(customer.getName());
             orderListResponse.setCustomerPhone(customer.getPhone());
             orderListResponse.setServerTime(master.getRevTime());
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 7eef5f52..6f0cd6fe 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -71,9 +71,12 @@
             <if test="payStatus != null">
                 AND pay_status = #{payStatus}
             </if>
-            <if test="workerId != null and workerId != 0">
+            <if test="workerId != null and workerId > 0">
                 AND worker_id = #{workerId}
             </if>
+            <if test="workerId == -1">
+                AND worker_id IS NULL
+            </if>
         </where>
         order by create_time desc
     </select>