From edc87eb493f942170e6d913a28d3840653fa041c Mon Sep 17 00:00:00 2001
From: pangyang <475446853@qq.com>
Date: Mon, 23 Mar 2026 16:45:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A7=BD=E6=B6=B2=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=94=A8=E6=88=B7=E4=BF=AE=E6=94=B9001?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/LiquidTankTaskSetVoService.java   | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java
index 08d30359..830d527a 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java
@@ -22,6 +22,7 @@ import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO;
 import org.springblade.desk.basic.util.IdUtil;
 import org.springblade.system.feign.IDictClient;
 import org.springblade.system.feign.IUserClient;
+import org.springblade.system.pojo.entity.User;
 import org.springblade.system.pojo.entity.UserInfo;
 import org.springframework.stereotype.Service;
 
@@ -82,7 +83,10 @@ public class LiquidTankTaskSetVoService {
             if(null != r){
                 UserInfo testUI = r.getData();
                 if (testUI != null) {
-                    vo.setTestUserRealName(testUI.getUser().getRealName());
+                    User usr = testUI.getUser();
+                    if(usr != null){
+                        vo.setTestUserRealName(usr.getRealName());
+                    }
                 }
             }
         }
@@ -92,7 +96,11 @@ public class LiquidTankTaskSetVoService {
             if(null != r){
                 UserInfo repeatTestUI = r.getData();
                 if (repeatTestUI != null) {
-                    vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
+                    User usr = repeatTestUI.getUser();
+                    if(usr != null){
+                        vo.setRepeatTestUserRealName(usr.getRealName());
+                    }
+//                    vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
                 }
             }
 
@@ -107,7 +115,11 @@ public class LiquidTankTaskSetVoService {
             if(null != r){
                 UserInfo processUI = r.getData();
                 if (processUI != null) {
-                    vo.setProcessUserRealName(processUI.getUser().getRealName());
+                    User usr = processUI.getUser();
+                    if(usr != null){
+                        vo.setProcessUserRealName(usr.getRealName());
+                    }
+//                    vo.setProcessUserRealName(processUI.getUser().getRealName());
                 }
             }
 
@@ -123,7 +135,11 @@ public class LiquidTankTaskSetVoService {
             if(null != r){
                 UserInfo reviewUI = r.getData();
                 if (reviewUI != null) {
-                    vo.setReviewUserRealName(reviewUI.getUser().getRealName());
+                    User usr = reviewUI.getUser();
+                    if(usr != null){
+                        vo.setReviewUserRealName(usr.getRealName());
+                    }
+//                    vo.setReviewUserRealName(reviewUI.getUser().getRealName());
                 }
             }
 
@@ -140,7 +156,11 @@ public class LiquidTankTaskSetVoService {
             if(null != r){
                 UserInfo sendUI = r.getData();
                 if (sendUI != null) {
-                    vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
+                    User usr = sendUI.getUser();
+                    if(usr != null){
+                        vo.setSendDurgUserRealName(usr.getRealName());
+                    }
+//                    vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
                 }
             }
 
@@ -156,7 +176,11 @@ public class LiquidTankTaskSetVoService {
             if(null != r){
                 UserInfo receiveUI = r.getData();
                 if (receiveUI != null) {
-                    vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
+                    User usr = receiveUI.getUser();
+                    if(usr != null){
+                        vo.setReceiveDurgUserRealName(usr.getRealName());
+                    }
+//                    vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
                 }
             }