diff --git a/src/main/java/com/spring/modules/sys/controller/DictTypeController.java b/src/main/java/com/spring/modules/sys/controller/DictTypeController.java index 06b6df48..00056c61 100644 --- a/src/main/java/com/spring/modules/sys/controller/DictTypeController.java +++ b/src/main/java/com/spring/modules/sys/controller/DictTypeController.java @@ -32,6 +32,16 @@ public class DictTypeController { if (Objects.isNull(dictType)){ throw new RuntimeException("字典编码为空"); } + if (!StringUtils.hasText(dictType.getDictType())){ + throw new RuntimeException("字典类型为空"); + } + if (!StringUtils.hasText(dictType.getSite())){ + throw new RuntimeException("工厂编码为空"); + } + List list = dictTypeService.list(new LambdaQueryWrapper().eq(DictType::getDictType, dictType.getDictType()).eq(DictType::getSite, dictType.getSite())); + if (null != list && !list.isEmpty()){ + throw new RuntimeException("该字典类型已存在!"); + } if (dictTypeService.save(dictType)) { return R.ok("保存成功!"); } diff --git a/src/main/resources/mapper/project/ProjectDao.xml b/src/main/resources/mapper/project/ProjectDao.xml index 611a3d41..a0cd655c 100644 --- a/src/main/resources/mapper/project/ProjectDao.xml +++ b/src/main/resources/mapper/project/ProjectDao.xml @@ -32,6 +32,7 @@ AND bu_no in ( select bu_no from AccessBu where site=#{query.site} and username=#{query.userName} ) + order by create_date desc