From 2d93ea1e9e520e37499ce5a09dd24f4fa707e2b3 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 26 九月 2023 09:02:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/entity/WrkMast.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 1c3bb5f..2a88d4b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -422,10 +422,14 @@
     public String getOrderNo$(){
         WrkDetlService wrkDetlService = SpringUtils.getBean(WrkDetlService.class);
         List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(this.wrkNo);
+        String orderNo = "";
         if (!Cools.isEmpty(wrkDetls) && wrkDetls.size()!=0){
-            return String.valueOf(wrkDetls.get(0).getOrderNo());
+            if (wrkDetls.get(0).getOrderNo() != null) {
+                orderNo = wrkDetls.get(0).getOrderNo();
+            }
+            return String.valueOf(orderNo);
         }
-        return null;
+        return "";
     }
 
     public String getIoTime$(){

--
Gitblit v1.9.1