From b20d173dc11ea3197c19d792533b67ae53893b3e Mon Sep 17 00:00:00 2001 From: swj <1211312234@qq.com> Date: Wed, 28 Sep 2022 16:40:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E4=BB=BB=E5=8A=A1=E4=B9=A6?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=9D=9E=E7=A9=BA=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lims/service/impl/EntrustServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) 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);