From e6d9f4a6520624559927def948c1571664240508 Mon Sep 17 00:00:00 2001
From: "zhaokaiyao@91isoft.com" <6922339zky>
Date: Wed, 19 Jan 2022 13:28:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=B7=A5=E4=BD=9C=E7=BB=84?=
 =?UTF-8?q?=E5=90=8D=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/WorkGroupController.java       | 44 ++++++++++++++++---
 1 file changed, 39 insertions(+), 5 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 ba18cc02..40b54d6d 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
@@ -5,6 +5,7 @@ import com.adc.da.http.ResponseMessage;
 import com.adc.da.http.Result;
 import com.adc.da.slrs.customWorkGroup.entity.WorkGroupQueryPage;
 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.ibatis.annotations.Delete;
@@ -14,6 +15,8 @@ import com.adc.da.slrs.customWorkGroup.entity.WorkGroup;
 import io.swagger.annotations.Api;
 import com.adc.da.base.web.BaseController;
 
+import java.util.List;
+
 /**
 * <p>
     *  前端控制器
@@ -34,9 +37,18 @@ public class WorkGroupController extends BaseController<WorkGroup> {
     @ApiModelProperty("新增工作组")
     @PostMapping
     public ResponseMessage addWorkGroup(WorkGroup workGroup) {
-        boolean add = iWorkGroupService.add(workGroup);
+        String meg="";
+        if (isDistinct(workGroup.getWorkGroup())){
+            if (iWorkGroupService.add(workGroup)){
+                meg="新增成功!";
+            }else {
+                meg="新增失败!";
+            }
+        }else {
+            meg="组名已存在!";
+        }
 
-        return Result.success(add);
+        return Result.success("200",meg);
     }
 
 
@@ -53,7 +65,6 @@ public class WorkGroupController extends BaseController<WorkGroup> {
     @GetMapping
     public ResponseMessage<IPage<WorkGroup>> getWorkGroupLists(WorkGroupQueryPage queryPage){
         IPage<WorkGroup> workGroup = iWorkGroupService.getWorkGroup(queryPage);
-
         return Result.success(workGroup);
     }
 
@@ -61,11 +72,34 @@ public class WorkGroupController extends BaseController<WorkGroup> {
     @ApiModelProperty("修改工作组")
     @PutMapping
     public ResponseMessage updateWorkGroup(WorkGroup workGroup){
-        boolean update = iWorkGroupService.update(workGroup);
+        String meg="";
+        if (isDistinct(workGroup.getWorkGroup())){
+            if (iWorkGroupService.update(workGroup)){
+                meg="修改成功!";
+            }else {
+                meg="修改失败";
+            }
 
-        return Result.success(update);
+        }else {
+            meg="组名已存在!";
+        }
+
+        return Result.success("200",meg);
     }
 
+    /**
+     * 判断提交的工作组名称是否重复
+     * @param groupName
+     * @return true 没有重复 false 有重复
+     */
+    private boolean isDistinct(String groupName){
 
+        QueryWrapper<WorkGroup> ew = new QueryWrapper<>();
+
+        ew.eq("work_group_name",groupName);
+
+        List<WorkGroup> list = iWorkGroupService.list(ew);
+        return list.isEmpty();
+    }
 
 }