From 1b8e7b9fb414c018b502128c63c42c2998fbaa57 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Thu, 18 May 2023 08:06:09 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=83=A8=E9=97=A8=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../youlai/system/mapper/SysDeptMapper.java   |  3 ++-
 .../youlai/system/pojo/entity/SysDept.java    |  9 +++-----
 .../service/impl/SysDeptServiceImpl.java      | 22 +++++++++++++++----
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java b/src/main/java/com/youlai/system/mapper/SysDeptMapper.java
index 00a13f52..b31e6b58 100644
--- a/src/main/java/com/youlai/system/mapper/SysDeptMapper.java
+++ b/src/main/java/com/youlai/system/mapper/SysDeptMapper.java
@@ -3,6 +3,7 @@ package com.youlai.system.mapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.youlai.system.framework.mybatisplus.DataPermission;
 import com.youlai.system.pojo.entity.SysDept;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -13,7 +14,7 @@ import java.util.List;
 @Mapper
 public interface SysDeptMapper extends BaseMapper<SysDept> {
 
-    // @DataPermission
+    @DataPermission(deptIdColumnName = "id")
     @Override
     List<SysDept> selectList(@Param(Constants.WRAPPER) Wrapper<SysDept> queryWrapper);
 }
diff --git a/src/main/java/com/youlai/system/pojo/entity/SysDept.java b/src/main/java/com/youlai/system/pojo/entity/SysDept.java
index a54e8227..551c5cdb 100644
--- a/src/main/java/com/youlai/system/pojo/entity/SysDept.java
+++ b/src/main/java/com/youlai/system/pojo/entity/SysDept.java
@@ -1,18 +1,14 @@
 package com.youlai.system.pojo.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.youlai.system.common.base.BaseEntity;
 import lombok.Data;
 
 /**
  * 部门表
- * @TableName sys_dept
  */
-@TableName(value ="sys_dept")
 @Data
 public class SysDept extends BaseEntity {
     /**
@@ -51,7 +47,8 @@ public class SysDept extends BaseEntity {
      */
     private Integer deleted;
 
+    private Long createBy;
+
+    private Long updateBy;
 
-    @TableField(exist = false)
-    private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
index 4d075edf..3205175b 100644
--- a/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
+++ b/src/main/java/com/youlai/system/service/impl/SysDeptServiceImpl.java
@@ -48,7 +48,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
         List<SysDept> deptList = this.list(
                 new LambdaQueryWrapper<SysDept>()
                         .like(StrUtil.isNotBlank(keywords), SysDept::getName, keywords)
-                        .eq(Validator.isNotNull(status), SysDept::getStatus, status)
+                        .eq(status != null, SysDept::getStatus, status)
                         .orderByAsc(SysDept::getSort)
         );
 
@@ -64,7 +64,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
             for (SysDept dept : deptList) {
                 Long parentId = dept.getParentId();
                 // 不在缓存ID列表的parentId是顶级节点ID，以此作为递归开始
-                if (cacheDeptIds.contains(parentId) == false) {
+                if (!cacheDeptIds.contains(parentId)) {
                     list.addAll(recurDeptList(parentId, deptList));
                     cacheDeptIds.add(parentId); // 避免重复递归
                 }
@@ -107,16 +107,30 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
     /**
      * 部门下拉选项
      *
-     * @return
+     * @return 部门下拉List集合
      */
     @Override
     public List<Option> listDeptOptions() {
+        List<Option> options =new ArrayList<>();
+
         List<SysDept> deptList = this.list(new LambdaQueryWrapper<SysDept>()
                 .eq(SysDept::getStatus, StatusEnum.ENABLE.getValue())
                 .select(SysDept::getId, SysDept::getParentId, SysDept::getName)
                 .orderByAsc(SysDept::getSort)
         );
-        List<Option> options = recurDeptTreeOptions(SystemConstants.ROOT_NODE_ID, deptList);
+
+        Set<Long> parentIds = deptList.stream().map(SysDept::getParentId)
+                .collect(Collectors.toSet());
+
+        Set<Long> childrenIds = deptList.stream().map(SysDept::getId)
+                .collect(Collectors.toSet());
+
+        for (Long parentId : parentIds) {
+            if(!childrenIds.contains(parentId)){
+                options.addAll(recurDeptTreeOptions(parentId, deptList));
+            }
+        }
+
         return options;
     }