diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java index f73530275..4021611f5 100644 --- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java +++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/vo/DictModel.java @@ -17,12 +17,17 @@ public class DictModel implements Serializable{ public DictModel() { } - public DictModel(String value, String text) { this.value = value; this.text = text; } + public DictModel(String id,String value, String text) { + this.id = id; + this.value = value; + this.text = text; + } + private String id; /** * 字典value */ diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml index 0b562ba18..1e5617c3c 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDictMapper.xml @@ -4,7 +4,7 @@ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 2d7b05d0b..5cc79a024 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -233,7 +233,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl targetMarketList = Arrays.stream(projectLibraryBase.getTargetMarket().split(",")).collect(Collectors.toList()); + if(targetMarketList.size() > 1){ + List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List collect = regionList.stream().filter(e -> targetMarketList.contains(e.getValue())).collect(Collectors.toList()); + Collections.sort(collect, Comparator.comparing(DictModel::getId)); + StringBuilder sb = new StringBuilder(); + for (DictModel dm:collect) { + sb.append(dm.getValue()).append(","); + } + String substring = sb.substring(0, sb.length() - 1); + projectLibraryBase.setTargetMarket(substring); + } + } checkExitData(projectLibraryBase); save(projectLibraryBase); @@ -472,6 +485,20 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl projectLibraryBaseList = new ArrayList<>(); + if(StringUtils.isNotBlank(libraryBase.getTargetMarket())){ + List targetMarketList = Arrays.stream(libraryBase.getTargetMarket().split(",")).collect(Collectors.toList()); + if(targetMarketList.size() > 1){ + List regionList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); + List collect = regionList.stream().filter(e -> targetMarketList.contains(e.getValue())).collect(Collectors.toList()); + Collections.sort(collect, Comparator.comparing(DictModel::getId)); + StringBuilder sb = new StringBuilder(); + for (DictModel dm:collect) { + sb.append(dm.getValue()).append(","); + } + String substring = sb.substring(0, sb.length() - 1); + libraryBase.setTargetMarket(substring); + } + } projectLibraryBaseList.add(libraryBase); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProjectLibraryBase::getParentId,libraryBase.getId());