From 3643370ec15afe0275dd581552bdaefbd0c34c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 6 Jan 2023 16:54:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AF=BC=E5=87=BA=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E6=B8=85=E5=8D=95=E7=A9=BA=E6=8C=87=E9=92=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ParamsCollectManifestEOServiceImpl.java   | 66 ++++++++++---------
 1 file changed, 34 insertions(+), 32 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
index 679e73909..3773046d8 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
@@ -3950,41 +3950,43 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
 
 			String control_type = record1.get("control_type").toString();
 			//references_col ->  #a# #
-			String references_col = record1.get("references_col").toString();
-			String[] references_colArr = references_col.split("#");
-			if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){
-				String fileId = references_colArr[2];
-				List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
-				String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
-				references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
-			}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue())
-					||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue())
-					||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){
-				String fileId = references_colArr[2];
-				List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
-				String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
-				references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
-			}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){
-				String fileId = references_colArr[2];
-				List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
-				String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
-				references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
-			}
-
-			StringBuilder references_colSb = new StringBuilder();
-			for (String col : references_col.split("#")) {
-				if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){
-					references_colSb.append(col).append("#");
+			if(!Objects.isNull(record1.get("references_col"))){
+				String references_col = record1.get("references_col").toString();
+				String[] references_colArr = references_col.split("#");
+				if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){
+					String fileId = references_colArr[2];
+					List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
+					String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
+				}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue())
+						||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue())
+						||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){
+					String fileId = references_colArr[2];
+					List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
+					String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
+				}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){
+					String fileId = references_colArr[2];
+					List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
+					String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
+					references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
 				}
-			}
 
-			if(StringUtils.isNotEmpty(references_colSb)){
-				references_col = references_colSb.substring(0,references_colSb.length()-1);
-			}else {
-				references_col = references_colSb.toString();
-			}
+				StringBuilder references_colSb = new StringBuilder();
+				for (String col : references_col.split("#")) {
+					if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){
+						references_colSb.append(col).append("#");
+					}
+				}
 
-			record1.put("references_col",references_col);
+				if(StringUtils.isNotEmpty(references_colSb)){
+					references_col = references_colSb.substring(0,references_colSb.length()-1);
+				}else {
+					references_col = references_colSb.toString();
+				}
+
+				record1.put("references_col",references_col);
+			}
 
 			// 处理负责领域
 			record1.put("duty_territory", dutyTerritoryMap.get(dutyTerritory));