From cf6064baa3863c942d420f42030c66aa8d97187a Mon Sep 17 00:00:00 2001
From: tyty <hello>
Date: Wed, 23 Aug 2023 10:03:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E5=AE=9E=E4=BE=8B=E7=B1=BB?=
 =?UTF-8?q?=E7=94=9F=E6=88=90bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wrapper/OperDefectStatisticsWrapper.java       | 31 +++++++++++-----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
index 326bb0b..5cac3e6 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/wrapper/OperDefectStatisticsWrapper.java
@@ -1,12 +1,10 @@
 package com.hnac.hzims.operational.defect.wrapper;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.operational.defect.entity.OperDefectStatisticsEntity;
 import com.hnac.hzims.operational.defect.vo.OperDefectStatisticsVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.system.entity.Dept;
 import org.springblade.system.user.cache.UserCache;
 import org.springblade.system.user.entity.User;
 
@@ -30,19 +28,22 @@ public class OperDefectStatisticsWrapper extends BaseEntityWrapper<OperDefectSta
 		User updateUser = UserCache.getUser(entity.getUpdateUser());
 		vo.setCreateUserName(createUser == null ? "" : createUser.getName());
 		vo.setUpdateUserName(updateUser == null ? "" : updateUser.getName());
-
-		User userC = UserCache.getUser(entity.getConclusionPeople());
-		vo.setConclusionPeopleName(userC == null ? "" : userC.getName());
-
-		User userF = UserCache.getUser(entity.getFinder());
-		vo.setFinderName(userF == null ? "" : userF.getName());
-
-		User userD = UserCache.getUser(entity.getDiscriminator());
-		vo.setDiscriminatorName(userD == null ? "" : userD.getName());
-
-		User userHn = UserCache.getUser(entity.getHandler());
-		vo.setHandlerName(userHn == null ? "" : userHn.getName());
-
+		if (Func.isNotEmpty(entity.getConclusionPeople())) {
+			User userC = UserCache.getUser(entity.getConclusionPeople());
+			vo.setConclusionPeopleName(userC == null ? "" : userC.getName());
+		}
+		if (Func.isNotEmpty(entity.getFinder())) {
+			User userF = UserCache.getUser(entity.getFinder());
+			vo.setFinderName(userF == null ? "" : userF.getName());
+		}
+		if (Func.isNotEmpty(entity.getDiscriminator())) {
+			User userD = UserCache.getUser(entity.getDiscriminator());
+			vo.setDiscriminatorName(userD == null ? "" : userD.getName());
+		}
+		if (Func.isNotEmpty(entity.getHandler())) {
+			User userHn = UserCache.getUser(entity.getHandler());
+			vo.setHandlerName(userHn == null ? "" : userHn.getName());
+		}
 		// 赋值消缺处理人名称
 		vo.setPlanHandlerName(Optional.ofNullable(entity.getPlanHandler()).map(Long::parseLong).map(UserCache::getUser).map(User::getName).orElse(entity.getPlanHandler()));
 		// 赋值两票工作负责人名称