diff --git a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java index 9aef277..976f700 100644 --- a/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java +++ b/lab-service/lab-lims/src/main/java/org/springblade/lims/service/impl/EntrustServiceImpl.java @@ -3143,6 +3143,13 @@ public class EntrustServiceImpl extends BaseServiceImpl queryWrapper.eq(ETask::getTaskBlueprintId, taskBlueprint.getId()); queryWrapper.eq(ETask::getDeptId, deptId); ETask eTask = eTaskService.getOne(queryWrapper); + if (eTask == null) { + return; + } + R deptName1 = sysClient.getDeptName(eTask.getDeptId()); + if (deptName1 == null || deptName1.getData() == null || deptName1.getData().equals("")) { + return; + } String deptName = sysClient.getDeptName(eTask.getDeptId()).getData(); result.put("deptName", deptName); result.put("acceptanceNum", entrust.getAcceptanceNum()); @@ -3180,7 +3187,9 @@ public class EntrustServiceImpl extends BaseServiceImpl SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); result.put("demandCompletionTime", format.format(eTask.getDemandCompletionTime())); result.put("simpleReceiverName", eTask.getSimpleReceiverName()); - result.put("simpleReceiveTime", format.format(eTask.getSimpleReceiveTime())); + if (eTask.getSimpleReceiveTime() != null) { + result.put("simpleReceiveTime", format.format(eTask.getSimpleReceiveTime())); + } if (!"".equals(eTask.getFlowRecipient()) && eTask.getFlowRecipient() != null) { String name3 = userClient.userInfoById(Long.parseLong(eTask.getFlowRecipient())).getData().getName(); result.put("flowRecipient", name3);