From 8f63d5ce747106195b279e1c158fd12f9997a770 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 18 三月 2025 19:08:40 +0800
Subject: [PATCH] 检验任务代码迁移&爱尚平台对接测试
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
index 0f78c44..c4e3f70 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/ProcessReportServiceImpl.java
@@ -28,10 +28,7 @@
import java.io.*;
import java.nio.file.Files;
import java.nio.file.Paths;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -77,9 +74,11 @@
List<ProcessReport> processReports = processReportMapper.getIds(ids);
for (ProcessReport processReport : processReports) {
List<String> name = new ArrayList<>();
- for (String s : processReport.getSignatory().split(",")) {
- User user = userMapper.selectById(Integer.parseInt(s));
- name.add(user.getName());
+ if(StringUtils.isNotEmpty(processReport.getSignatory())) {
+ for (String s : processReport.getSignatory().split(",")) {
+ User user = userMapper.selectById(Integer.parseInt(s));
+ name.add(user.getName());
+ }
}
String signatoryName = name.stream().collect(Collectors.joining(","));
processReport.setSignatoryName(signatoryName);
@@ -293,7 +292,11 @@
}
else if (j == 6) {
try{
- textRenderData.setText(processReports.get((i-1) + (index1 - 1) * 20).getSendTime()+"");
+ String text = "";
+ if(Objects.nonNull(processReports.get((i-1) + (index1 - 1) * 20).getSendTime())) {
+ text = processReports.get((i-1) + (index1 - 1) * 20).getSendTime() + "";
+ }
+ textRenderData.setText(text);
} catch (Exception e) {
textRenderData.setText("");
}
--
Gitblit v1.9.3