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); }