From 28cc4458cc6a88bc82165a9be0ea731b6b569c6c Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期日, 29 一月 2023 09:36:02 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java |    5 ++++-
 src/main/resources/application.yml                          |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 450a109..baf969e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -349,7 +349,10 @@
                         Boolean mastFinished = wrkMastService.checkFinishByOrder(wrkDetls101.get(0).getOrderNo());
                         if (mastFinished) {
                             Order order = orderService.selectByNo(wrkDetls101.get(0).getOrderNo());
-                            orderService.updateSettle(order.getId(),4L,1L);
+                            if (!Cools.isEmpty(order)) {
+                                orderService.updateSettle(order.getId(),4L,1L);
+
+                            }
                         }
                     }
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7a095bd..46d7e27 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,5 +1,5 @@
 server:
-  port: 8080
+  port: 8081
   servlet:
     context-path: /@pom.build.finalName@
 

--
Gitblit v1.9.1