From 8cee2af209cbd2caf98d244e1f4ee973609368b9 Mon Sep 17 00:00:00 2001
From: kenhy <kenhysoft@sina.com>
Date: Tue, 19 May 2020 01:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8BUG=E4=BB=A5=E5=8F=8A=E9=83=A8=E9=97=A8ID=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E8=87=AA=E5=A2=9E=E8=BF=87=E5=A4=A7=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../co/yixiang/modules/system/domain/Dept.java     |  7 ++-----
 .../modules/system/rest/DeptController.java        | 14 ++++++++++----
 .../modules/system/service/DeptService.java        |  2 +-
 .../system/service/impl/DeptServiceImpl.java       |  4 ++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java
index 8981d817..b7a78367 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/domain/Dept.java
@@ -7,11 +7,8 @@
 * 一经发现盗用、分享等行为，将追究法律责任，后果自负
 */
 package co.yixiang.modules.system.domain;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 
@@ -29,7 +26,7 @@ import java.io.Serializable;
 public class Dept implements Serializable {
 
     /** ID */
-    @TableId
+    @TableId(value = "id",type= IdType.AUTO)
     private Long id;
 
 
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java
index 845f7e38..eab4c99a 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/rest/DeptController.java
@@ -30,6 +30,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -109,16 +110,21 @@ public class DeptController {
     @PreAuthorize("@el.check('admin','dept:del')")
     public ResponseEntity<Object> delete(@RequestBody Set<Long> ids){
         //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作");
-        Set<DeptDto> deptDtos = new HashSet<>();
+        List<Long> deptIds = new ArrayList<>();
         for (Long id : ids) {
             List<Dept> deptList = deptService.findByPid(id);
-            deptDtos.add(generator.convert(deptService.getOne(new QueryWrapper<Dept>().eq("id",id)),DeptDto.class));
+            Dept dept =  deptService.getOne(new QueryWrapper<Dept>().eq("id",id));
+            if(null!=dept){
+                deptIds.add(dept.getId());
+            }
             if(CollectionUtil.isNotEmpty(deptList)){
-                deptDtos = deptService.getDeleteDepts(deptList, deptDtos);
+                for(Dept d:deptList){
+                    deptIds.add(d.getId());
+                }
             }
         }
         try {
-            deptService.removeByIds(deptDtos);
+            deptService.removeByIds(deptIds);
         }catch (Throwable e){
             ThrowableUtil.throwForeignKeyException(e, "所选部门中存在岗位或者角色关联，请取消关联后再试");
         }
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java
index e518586c..95af37b9 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/DeptService.java
@@ -67,7 +67,7 @@ public interface DeptService  extends BaseService<Dept>{
      * @param deptDtos /
      * @return /
      */
-    Set<DeptDto> getDeleteDepts(List<Dept> deptList, Set<DeptDto> deptDtos);
+    /*Set<DeptDto> getDeleteDepts(List<Dept> deptList, Set<DeptDto> deptDtos);*/
 
     /**
      * 根据角色ID查询
diff --git a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
index 5d57c084..e510620c 100644
--- a/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
+++ b/yshop-system/src/main/java/co/yixiang/modules/system/service/impl/DeptServiceImpl.java
@@ -161,7 +161,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
      * @param deptDtos /
      * @return /
      */
-    @Override
+/*    @Override
     public Set<DeptDto> getDeleteDepts(List<Dept> deptList, Set<DeptDto> deptDtos) {
 
         for (Dept dept : deptList) {
@@ -172,7 +172,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, Dept> implement
             }
         }
         return deptDtos;
-    }
+    }*/
 
     /**
      * 根据角色ID查询