From 44bc5e0abbfa703d594fe37a75099ac260ffea48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Fri, 27 Sep 2024 15:40:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=82=E5=9C=BA=E6=B3=95?= =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95=E7=9B=B4=E6=8E=A5=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsMarketStandardServiceImpl.java | 54 +++++++++---------- 1 file changed, 26 insertions(+), 28 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index d9a8f06e..89374f57 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -567,21 +567,20 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl listLawsMarketStandardDetail = lawsMarketStandardDetailService .list(queryLawsMarketStandardDetail); - if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){ - continue; + if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){ + List listLawsDomesticStandard = new ArrayList<>(); + String country = lawsMarketStandardOld.getCountry(); + for (LawsMarketStandardDetail lawsMarketStandardDetail : listLawsMarketStandardDetail) { + String countryDetail = lawsMarketStandardDetail.getCountry(); + String dis = StringUtils.isEmpty(countryDetail) ? country : country + "," + countryDetail; + List data = Arrays.stream(dis.split(",")).distinct().collect(Collectors.toList()); + LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard(); + lawsDomesticStandard.setId(lawsMarketStandardDetail.getStandardId()); + lawsDomesticStandard.setApplicableMarket(String.join(",",data)); + listLawsDomesticStandard.add(lawsDomesticStandard); + } + lawsDomesticStandardService.updateBatchById(listLawsDomesticStandard); } - List listLawsDomesticStandard = new ArrayList<>(); - String country = lawsMarketStandardOld.getCountry(); - for (LawsMarketStandardDetail lawsMarketStandardDetail : listLawsMarketStandardDetail) { - String countryDetail = lawsMarketStandardDetail.getCountry(); - String dis = StringUtils.isEmpty(countryDetail) ? country : country + "," + countryDetail; - List data = Arrays.stream(dis.split(",")).distinct().collect(Collectors.toList()); - LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard(); - lawsDomesticStandard.setId(lawsMarketStandardDetail.getStandardId()); - lawsDomesticStandard.setApplicableMarket(String.join(",",data)); - listLawsDomesticStandard.add(lawsDomesticStandard); - } - lawsDomesticStandardService.updateBatchById(listLawsDomesticStandard); lawsStandardMasterPlanService.syncMarketRegulationListUpdate(lawsMarketStandardOld.getId(),lawsMarketStandardOld.getCountry()); } return Result.OK(ResultCommon.OK); @@ -618,21 +617,20 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl listLawsMarketStandardDetail = lawsMarketStandardDetailService .list(queryLawsMarketStandardDetail); - if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){ - return Result.OK(ResultCommon.OK); + if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){ + List listLawsDomesticStandard = new ArrayList<>(); + String country = lawsMarketStandardOld.getCountry(); + for (LawsMarketStandardDetail lawsMarketStandardDetail : listLawsMarketStandardDetail) { + String countryDetail = lawsMarketStandardDetail.getCountry(); + String dis = StringUtils.isEmpty(countryDetail) ? country : country + "," + countryDetail; + List data = Arrays.stream(dis.split(",")).distinct().collect(Collectors.toList()); + LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard(); + lawsDomesticStandard.setId(lawsMarketStandardDetail.getStandardId()); + lawsDomesticStandard.setApplicableMarket(String.join(",",data)); + listLawsDomesticStandard.add(lawsDomesticStandard); + } + lawsDomesticStandardService.updateBatchById(listLawsDomesticStandard); } - List listLawsDomesticStandard = new ArrayList<>(); - String country = lawsMarketStandardOld.getCountry(); - for (LawsMarketStandardDetail lawsMarketStandardDetail : listLawsMarketStandardDetail) { - String countryDetail = lawsMarketStandardDetail.getCountry(); - String dis = StringUtils.isEmpty(countryDetail) ? country : country + "," + countryDetail; - List data = Arrays.stream(dis.split(",")).distinct().collect(Collectors.toList()); - LawsDomesticStandard lawsDomesticStandard = new LawsDomesticStandard(); - lawsDomesticStandard.setId(lawsMarketStandardDetail.getStandardId()); - lawsDomesticStandard.setApplicableMarket(String.join(",",data)); - listLawsDomesticStandard.add(lawsDomesticStandard); - } - lawsDomesticStandardService.updateBatchById(listLawsDomesticStandard); lawsStandardMasterPlanService.syncMarketRegulationListUpdate(id,lawsMarketStandardOld.getCountry()); return Result.OK(ResultCommon.OK); }