From c09345ca208eb4af7a830fff05969b5f6fa93730 Mon Sep 17 00:00:00 2001
From: chuan <2256222053@qq.com>
Date: Tue, 14 Dec 2021 17:42:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=92=E5=BD=92?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E9=83=A8=E9=97=A8=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=B9=E8=8A=82=E7=82=B9=E6=8C=87=E5=AE=9A=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复递归生成部门数据时，根节点指定错误
修改common-mybatis包里面的common-web为可选依赖
---
 .../com/youlai/admin/service/impl/SysDeptServiceImpl.java  | 7 +++----
 youlai-common/common-mybatis/pom.xml                       | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDeptServiceImpl.java b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDeptServiceImpl.java
index 5f013cef..afd3493c 100644
--- a/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDeptServiceImpl.java
+++ b/youlai-admin/admin-boot/src/main/java/com/youlai/admin/service/impl/SysDeptServiceImpl.java
@@ -9,17 +9,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.admin.common.constant.SystemConstants;
 import com.youlai.admin.mapper.SysDeptMapper;
 import com.youlai.admin.pojo.entity.SysDept;
-import com.youlai.admin.pojo.entity.SysUser;
 import com.youlai.admin.pojo.vo.DeptVO;
 import com.youlai.admin.pojo.vo.TreeSelectVO;
 import com.youlai.admin.service.ISysDeptService;
-import com.youlai.admin.service.ISysRolePermissionService;
 import com.youlai.admin.service.ISysUserService;
 import com.youlai.common.constant.GlobalConstants;
 import com.youlai.common.web.util.JwtUtils;
 import lombok.AllArgsConstructor;
 import org.apache.logging.log4j.util.Strings;
 import org.springframework.stereotype.Service;
+
 import java.util.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
@@ -120,8 +119,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
                 .eq(SysDept::getStatus, GlobalConstants.STATUS_YES)
                 .orderByAsc(SysDept::getSort)
         );
-
-        List<TreeSelectVO> deptSelectList = recursionTreeSelectList(JwtUtils.getJwtPayload().getLong("deptId"), deptList);
+        SysDept sysDept = this.getById(JwtUtils.getJwtPayload().getLong("deptId"));
+        List<TreeSelectVO> deptSelectList = recursionTreeSelectList(sysDept.getParentId(), deptList);
         return deptSelectList;
     }
 
diff --git a/youlai-common/common-mybatis/pom.xml b/youlai-common/common-mybatis/pom.xml
index dfeb297c..b3ffaf80 100644
--- a/youlai-common/common-mybatis/pom.xml
+++ b/youlai-common/common-mybatis/pom.xml
@@ -39,6 +39,7 @@
         <dependency>
             <groupId>com.youlai</groupId>
             <artifactId>common-web</artifactId>
+            <optional>true</optional>
         </dependency>
     </dependencies>
 </project>
-- 
GitLab