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 d1610c7fb..8f65cc3e1 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 @@ -150,7 +150,7 @@ --> - + and dict_name like '%1%%' escape '1' diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java index 21247e097..f42470d02 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformAreaController.java @@ -91,8 +91,13 @@ public class OnlCgformAreaController extends JeroController add(@Validated @RequestBody OnlCgformArea onlCgformArea) { - onlCgformAreaService.add(onlCgformArea); - return Result.OK("添加成功!"); + int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); + if (count > 0) { + return Result.error("同一所属模块下,展示区域名称不能重复!"); + }else { + onlCgformAreaService.add(onlCgformArea); + return Result.OK("添加成功!"); + } } /** @@ -106,8 +111,13 @@ public class OnlCgformAreaController extends JeroController edit(@Validated @RequestBody OnlCgformArea onlCgformArea) { - onlCgformAreaService.editById(onlCgformArea); - return Result.OK("编辑成功!"); + int count=onlCgformAreaService.queryExitAreaName(onlCgformArea); + if (count > 0) { + return Result.error("同一所属模块下,展示区域名称不能重复!"); + }else { + onlCgformAreaService.editById(onlCgformArea); + return Result.OK("编辑成功!"); + } } /** @@ -127,8 +137,8 @@ public class OnlCgformAreaController extends JeroController { * @return */ IPage queryPageList(Map params); + + /** + * 同一所属模块下,展示区域名称不能重复 + * + * @return + */ + Integer queryExitAreaName(OnlCgformArea onlCgformArea); } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java index 47927a0b5..749239246 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformAreaServiceImpl.java @@ -48,7 +48,21 @@ public class OnlCgformAreaServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotBlank(onlCgformArea.getShowArea())) { + queryWrapper.eq(OnlCgformArea::getShowArea, onlCgformArea.getShowArea()) + .eq(OnlCgformArea::getIsModel, onlCgformArea.getIsModel()); + } + Integer count = onlCgformAreaMapper.selectCount(queryWrapper); + return count; + } /** * 更新 * diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java index 0ba4c5989..a623cd5eb 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/service/impl/OnlCgformTagServiceImpl.java @@ -71,8 +71,8 @@ public class OnlCgformTagServiceImpl extends ServiceImpl