From 2b5033b59f061e3f8cfaa7dfffe6d18e3d4b31ce Mon Sep 17 00:00:00 2001
From: Aug <17674666882@163.com>
Date: Thu, 5 Dec 2024 14:08:08 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8-?=
 =?UTF-8?q?=E6=94=B6=E8=97=8F=E7=8A=B6=E6=80=81=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=A9=BA=E6=8C=87=E9=92=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/modules/apiService/impl/CollectionServiceImpl.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java
index 0263013..1c587cd 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/CollectionServiceImpl.java
@@ -67,10 +67,16 @@ public class CollectionServiceImpl implements CollectionService {
             WorkorderTemplate template = workorderTemplateService.getById(record.getTemplateId());
             //添加工单状态说明
             for (WorkorderStatus status : workorderStatus) {
-                if(template.getStatusId().equals(status.getId())){
-                    template.setStatusDescribe(status.getName());
-                    break;
+                //工单状态为空是，不设置状态描述
+                if(null != template.getStatusId()){
+                    if(template.getStatusId().equals(status.getId())){
+                        template.setStatusDescribe(status.getName());
+                        break;
+                    }
+                }else {
+                    continue;
                 }
+
             }
             record.setWorkorderTemplate(template);
         }