diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index ba9e8ebf..5228dee2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -3752,27 +3752,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl loreAttacheList = sarStandardsInfoDao.selectOldSystemFile(); - for (OldSystem src : loreAttacheList) { - if(StringUtils.isNotBlank(src.getFileSrc())){ - // 通过 / 去分割 / 的最后一位 - String[] split = src.getFileSrc().split("/"); - List asList = Arrays.asList(split); - //集合的最后一个就是名称 - int size = asList.size(); - String s = asList.get(size-1); - for (OldSystem data: loreAttacheList){ - //相等证明是数据本身 - if(!src.getFileId().equals(data.getFileId())) { - if (StringUtils.isNotBlank(data.getFileSrc())) { - // 通过 / 去分割 / 的最后一位 - String[] split1 = data.getFileSrc().split("/"); - List asList1 = Arrays.asList(split1); - //集合的最后一个就是名称 - int size1 = asList1.size(); - String s1 = asList1.get(size1 - 1); - if (s.equals(s1)) { - set.add(src.getFileId()); - } + for (OldSystem data : loreAttacheList) { + if(StringUtils.isNotBlank(data.getFileSign())){ + for (OldSystem file : loreAttacheList){ + if(StringUtils.isNotBlank(file.getFileSign())){ + if(!data.getFileId().equals(file.getFileId())){ + set.add(data); } } } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index c40ce3d5..ab83b51d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -1918,7 +1918,7 @@