From ebe6cd5bf70d40841446303957705db213f314ed Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 19 Jan 2022 19:29:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=A4=E6=96=AD=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E9=87=8D=E5=A4=8D=E6=97=B6=E6=8E=92=E9=99=A4=E8=87=AA?=
 =?UTF-8?q?=E8=BA=AB=20=E8=A7=84=E8=8C=83=E4=BA=86=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkGroupController.java       | 41 ++++++++++++-------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
index dfeab7da..7685ce67 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/customWorkGroup/controller/WorkGroupController.java
@@ -8,6 +8,7 @@ import com.adc.da.slrs.customWorkGroup.service.IWorkGroupService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.codec.language.Nysiis;
 import org.apache.ibatis.annotations.Delete;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -37,18 +38,21 @@ public class WorkGroupController extends BaseController<WorkGroup> {
     @ApiModelProperty("新增工作组")
     @PostMapping
     public ResponseMessage addWorkGroup(WorkGroup workGroup) {
-        String meg="";
-        if (isDistinct(workGroup.getWorkGroup())){
+        ResponseMessage<Object> result = Result.success();
+
+        if (isDistinct(workGroup.getWorkGroup(),null)){
             if (iWorkGroupService.add(workGroup)){
-                meg="新增成功!";
+                result=Result.success("200","新增成功");
             }else {
-                meg="新增失败!";
+                result=Result.error("201","新增失败");
+
             }
         }else {
-            meg="组名已存在!";
+            result=Result.error("202","组名已存在");
+
         }
 
-        return Result.success("200",meg);
+        return result;
     }
 
 
@@ -72,32 +76,39 @@ public class WorkGroupController extends BaseController<WorkGroup> {
     @ApiModelProperty("修改工作组")
     @PutMapping
     public ResponseMessage updateWorkGroup(WorkGroup workGroup){
-        String meg="";
-        if (isDistinct(workGroup.getWorkGroup())){
+
+        ResponseMessage<Object> result = Result.success();
+
+        if (isDistinct(workGroup.getWorkGroup(),workGroup.getId())){
             if (iWorkGroupService.update(workGroup)){
-                meg="修改成功!";
+                result=Result.success("200", "修改成功");
             }else {
-                meg="修改失败";
+                result=Result.error("201", "修改失败");
             }
 
         }else {
-            meg="组名已存在!";
+            result=Result.error("202", "组名已存在");
         }
 
-        return Result.success("200",meg);
+        return  result;
     }
 
     /**
      * 判断提交的工作组名称是否重复
-     * @param groupName
-     * @return true 没有重复 false 有重复
+     * @param groupName 条件
+     * @param id 排除id
+     * @returntrue 没有重复 false 有重复
      */
-    private boolean isDistinct(String groupName){
+    private boolean isDistinct(String groupName,String id){
 
         QueryWrapper<WorkGroup> ew = new QueryWrapper<>();
 
         ew.eq("work_group_name",groupName);
 
+        if (id!=null){
+            ew.ne("id",id);
+        }
+
         List<WorkGroup> list = iWorkGroupService.list(ew);
         return list.isEmpty();
     }