WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理导出参数清单空指针问题。

Browse Source
This commit is contained in:
高嵩
2023-01-06 16:56:21 +08:00
parent 3643370ec1
commit 491dd13e4d
1 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java
+33 -31
View File
@@ -3952,40 +3952,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
//references_col -> #a# # //references_col -> #a# #
if(!Objects.isNull(record1.get("references_col"))){ if(!Objects.isNull(record1.get("references_col"))){
String references_col = record1.get("references_col").toString(); String references_col = record1.get("references_col").toString();
String[] references_colArr = references_col.split("#"); if(StringUtils.isNotEmpty(references_col)){
if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){ String[] references_colArr = references_col.split("#");
String fileId = references_colArr[2]; if(StringUtils.equals(control_type,ControlTypeEnum.FILE.getValue())){
List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId); String fileId = references_colArr[2];
String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue()) references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue()) }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_FILE.getValue())
||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){ ||StringUtils.equals(control_type,ControlTypeEnum.PULL_SINGLE_FILE.getValue())
String fileId = references_colArr[2]; ||StringUtils.equals(control_type,ControlTypeEnum.PULL_MORE_FILE.getValue())){
List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId); String fileId = references_colArr[2];
String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(","));
}else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){ references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName;
String fileId = references_colArr[2]; }else if(StringUtils.equals(control_type,ControlTypeEnum.TEXT_PULL_SINGLE_FILE.getValue())){
List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId); String fileId = references_colArr[2];
String fileName = fileInfos.stream().map(OSSFile::getFileName).collect(Collectors.joining(",")); List<OSSFile> fileInfos = this.ossFileService.getFileInfos(fileId);
references_col = "#"+ references_colArr[0] + "#" + references_colArr[1] + "#" + fileName; 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(StringUtils.isNotEmpty(references_colSb)){ StringBuilder references_colSb = new StringBuilder();
references_col = references_colSb.substring(0,references_colSb.length()-1); for (String col : references_col.split("#")) {
}else { if(StringUtils.isNotEmpty(col) && !StringUtils.equals(col," ")){
references_col = references_colSb.toString(); 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);
}
} }
// 处理负责领域 // 处理负责领域