From daa0000e75009c101f5810420de43219637becb3 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Fri, 26 May 2023 13:55:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DBug=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E9=80=89=E9=A1=B9=E9=87=8D=E5=A4=8D=E5=92=8C?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/sys/controller/DictItemController.java |  4 ++--
 .../adc/da/sys/service/DictItemServiceImpl.java   | 15 ++++++++++++++-
 .../main/java/com/adc/da/sys/vo/DictItemVo.java   |  3 +++
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java
index 404a396..462953c 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/controller/DictItemController.java
@@ -48,7 +48,7 @@ public class DictItemController {
      */
     @ApiOperation(value = "修改数据字典记录")
     @PutMapping("/edit")
-    public ResponseMessage edit(@RequestBody DictItemVo dictItemVo) {
+    public ResponseMessage edit(@Valid @RequestBody DictItemVo dictItemVo) {
         return dictItemService.edit(dictItemVo);
     }
 
@@ -66,7 +66,7 @@ public class DictItemController {
      */
     @ApiOperation(value = "新增数据字典记录")
     @PostMapping("/add")
-    public ResponseMessage add(@RequestBody DictItemVo dictItemVo) {
+    public ResponseMessage add(@Valid @RequestBody DictItemVo dictItemVo) {
         return dictItemService.add(dictItemVo);
     }
 }
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java
index bcddedf..1e53284 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/service/DictItemServiceImpl.java
@@ -62,6 +62,11 @@ public class DictItemServiceImpl extends ServiceImpl<DictItemDao, DictItemEntity
 
     @Override
     public ResponseMessage edit(DictItemVo dictItemVo) {
+        //判断传入的选项名是否重复
+        if (dictItemNameDuplicate(dictItemVo.getItemName())) {
+            return Result.error("重复选项名");
+        }
+
         try {
             DictItemEntity dictItemEntity = new DictItemEntity();
             BeanUtil.copyProperties(dictItemVo, dictItemEntity);
@@ -89,6 +94,11 @@ public class DictItemServiceImpl extends ServiceImpl<DictItemDao, DictItemEntity
         return Result.success("删除成功");
     }
 
+    public boolean dictItemNameDuplicate(String dictItemName) {
+        List<DictItemEntity> item = query().like("item_name", dictItemName).list();
+        return item.size() > 0;
+    }
+
     @Override
     public ResponseMessage add(DictItemVo dictItemVo) {
         //判断上级字典id是否存在
@@ -100,7 +110,10 @@ public class DictItemServiceImpl extends ServiceImpl<DictItemDao, DictItemEntity
         if (dictEntity == null) {
             return Result.error("上级字典id无效");
         }
-
+        //判断传入的选项名是否重复
+        if (dictItemNameDuplicate(dictItemVo.getItemName())) {
+            return Result.error("重复选项名");
+        }
         try {
             DictItemEntity dictItemEntity = BeanCopyUtils.copyBean(dictItemVo, DictItemEntity.class);
             dictItemEntity.setId(UUID.randomUUID10())
diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/vo/DictItemVo.java b/adc-da-sys/src/main/java/com/adc/da/sys/vo/DictItemVo.java
index 542bbc1..3528a98 100644
--- a/adc-da-sys/src/main/java/com/adc/da/sys/vo/DictItemVo.java
+++ b/adc-da-sys/src/main/java/com/adc/da/sys/vo/DictItemVo.java
@@ -4,6 +4,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author CaiHaohan
  */
@@ -40,6 +42,7 @@ public class DictItemVo {
     /**
      * 排序
      */
+    @NotNull(message = "缺少排序字段")
     private Double itemOrder;
 
 }