From 491dd13e4d5b3cc9ef2900a4ba9ce80cdd9e3193 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Fri, 6 Jan 2023 16:56:21 +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 | 64 ++++++++++--------- 1 file changed, 33 insertions(+), 31 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 3773046d8..a8ece1d57 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 @@ -3952,40 +3952,42 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl #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 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 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 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 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 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 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); + } } // 处理负责领域