处理导出参数清单空指针问题。
This commit is contained in:
+33
-31
@@ -3952,40 +3952,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl<ParamsCollec
|
||||
//references_col -> #a# #
|
||||
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;
|
||||
}
|
||||
|
||||
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_col)){
|
||||
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);
|
||||
}
|
||||
}
|
||||
|
||||
// 处理负责领域
|
||||
|
||||
Reference in New Issue
Block a user