From dbdc1b2a5503b1b882f3d4b75ab60ae15d354241 Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Thu, 27 Jul 2023 11:14:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=80=BC=E7=8F=AD=E7=AA=81?=
 =?UTF-8?q?=E5=8F=91=E4=BA=8B=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../duty/service/impl/ImsDutyEmergencyServiceImpl.java            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
index 8067b69..7e836e0 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsDutyEmergencyServiceImpl.java
@@ -80,9 +80,13 @@ public class ImsDutyEmergencyServiceImpl extends BaseServiceImpl<ImsDutyEmergenc
 		if (CollectionUtils.isNotEmpty(records)){
 			collect= records.stream().map(sig -> {
 				R<User> user = userClient.userInfoById(sig.getRegistrant());
-				sig.setRegistrantName(user.getData().getName());
+				if (user.isSuccess()&&ObjectUtils.isNotEmpty(user.getData())){
+					sig.setRegistrantName(user.getData().getName());
+				}
 				R<User> userR = userClient.userInfoById(sig.getChargePerson());
-				sig.setChargePersonName(userR.getData().getName());
+				if (userR.isSuccess()&&ObjectUtils.isNotEmpty(userR.getData())){
+					sig.setChargePersonName(userR.getData().getName());
+				}
 				ImsDutyClassEntity classEntity = imsDutyClassService.getById(sig.getDutyClass());
 				sig.setDutyClassName(classEntity.getClassName());
 				return sig;