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); }