槽液管理查询用户修改

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java

@@ -639,7 +639,7 @@ public class LiquidTankTaskCopyController extends BladeController {
 //        List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportId(report.getId());
 
         List<LiquidTankTaskCopyVO> list = service.getListByLiquidTankReportIdNew(report.getId());
-
+        if(null != list && list.size() > 0){
 
             Long centerId = list.get(0).getWorkCenterId();
 
@@ -652,8 +652,6 @@ public class LiquidTankTaskCopyController extends BladeController {
                 name = rule.get(0).getNamePrefix();
                 tableTtile = rule.get(0).getReportCode();
             }
-
-
             try {
                 FullMergeExcelUtil.exportUserExcel(
                         response,
@@ -671,7 +669,7 @@ public class LiquidTankTaskCopyController extends BladeController {
                 throw new RuntimeException(e);
             }
 
-
+        }
     }
 
     /**

blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskSetVoService.java

@@ -6,6 +6,7 @@ import jakarta.annotation.Resource;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.core.tool.api.R;
 import org.springblade.desk.basic.pojo.entity.Formula;
 import org.springblade.desk.basic.pojo.entity.TeamSet;
 import org.springblade.desk.basic.pojo.entity.WorkCenter;
@@ -76,44 +77,94 @@ public class LiquidTankTaskSetVoService {
             vo.setWcName(wc.getWcName());
         }
         if (IdUtil.isValid(vo.getTestUserId())) {
-            UserInfo testUI = userClient.userInfo(vo.getTestUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getTestUserId());
+            if(null != r){
+                UserInfo testUI = r.getData();
                 if (testUI != null) {
                     vo.setTestUserRealName(testUI.getUser().getRealName());
                 }
             }
+        }
         if (IdUtil.isValid(vo.getRepeatTestUserId())) {
-            UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getRepeatTestUserId());
+            if(null != r){
+                UserInfo repeatTestUI = r.getData();
                 if (repeatTestUI != null) {
                     vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
                 }
             }
+
+//            UserInfo repeatTestUI = userClient.userInfo(vo.getRepeatTestUserId()).getData();
+//            if (repeatTestUI != null) {
+//                vo.setRepeatTestUserRealName(repeatTestUI.getUser().getRealName());
+//            }
+        }
         if (IdUtil.isValid(vo.getProcessUserId())) {
-            UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getProcessUserId());
+            if(null != r){
+                UserInfo processUI = r.getData();
                 if (processUI != null) {
                     vo.setProcessUserRealName(processUI.getUser().getRealName());
                 }
             }
+
+//            UserInfo processUI = userClient.userInfo(vo.getProcessUserId()).getData();
+//            if (processUI != null) {
+//                vo.setProcessUserRealName(processUI.getUser().getRealName());
+//            }
+        }
         // 审核人
         if (IdUtil.isValid(vo.getReviewUserId())) {
-            UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getReviewUserId());
+            if(null != r){
+                UserInfo reviewUI = r.getData();
                 if (reviewUI != null) {
                     vo.setReviewUserRealName(reviewUI.getUser().getRealName());
                 }
             }
+
+
+//            UserInfo reviewUI = userClient.userInfo(vo.getReviewUserId()).getData();
+//            if (reviewUI != null) {
+//                vo.setReviewUserRealName(reviewUI.getUser().getRealName());
+//            }
+        }
         // 发药人
         if (IdUtil.isValid(vo.getSendDrugUserId())) {
-            UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData();
+
+            R<UserInfo> r = userClient.userInfo(vo.getSendDrugUserId());
+            if(null != r){
+                UserInfo sendUI = r.getData();
                 if (sendUI != null) {
                     vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
                 }
             }
+
+//            UserInfo sendUI = userClient.userInfo(vo.getSendDrugUserId()).getData();
+//            if (sendUI != null) {
+//                vo.setSendDurgUserRealName(sendUI.getUser().getRealName());
+//            }
+        }
         // 领药人
         if (IdUtil.isValid(vo.getReceiveDrugUserId())) {
-            UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
-            if (receiveUI != null && receiveUI.getUser() != null) {
+
+            R<UserInfo> r = userClient.userInfo(vo.getReceiveDrugUserId());
+            if(null != r){
+                UserInfo receiveUI = r.getData();
+                if (receiveUI != null) {
                     vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
                 }
             }
+
+//            UserInfo receiveUI = userClient.userInfo(vo.getReceiveDrugUserId()).getData();
+//            if (receiveUI != null && receiveUI.getUser() != null) {
+//                vo.setReceiveDurgUserRealName(receiveUI.getUser().getRealName());
+//            }
+        }
         WorkTank wt = workTankService.getById(vo.getWorkTankId());
         if (wt != null) {
             vo.setWorkTankName(wt.getWorkTankCode());