From b555eb27732eb5b605da8ec9fb53f3bfe0f1e324 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 24 Oct 2024 15:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BA=BA=E5=91=98=E6=A0=91?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/system/mapper/SysUserMapper.java    |  8 +++++++
 .../service/impl/SysDeptServiceImpl.java      |  4 ++++
 .../resources/mapper/system/SysUserMapper.xml | 23 +++++++++++++++++++
 3 files changed, 35 insertions(+)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
index 2cfda8c..87a6413 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/mapper/SysUserMapper.java
@@ -2,6 +2,7 @@ package com.bonus.system.mapper;
 
 import java.util.List;
 
+import com.bonus.system.api.domain.SysDept;
 import org.apache.ibatis.annotations.Param;
 import com.bonus.system.api.domain.SysUser;
 
@@ -135,4 +136,11 @@ public interface SysUserMapper {
     public SysUser checkEmailUnique(String email);
 
     Integer approvalStatus(Long userId);
+
+    /**
+     * 组织人员树
+     * @param dept
+     * @return
+     */
+    List<SysDept> getTree(SysDept dept);
 }
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
index 437a23a..a6e6997 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysDeptServiceImpl.java
@@ -84,6 +84,10 @@ public class SysDeptServiceImpl implements ISysDeptService
     @Override
     public List<TreeSelect> selectDeptUserTreeList(SysDept dept)
     {
+        if (dept != null && dept.getDeptId() != null && dept.getDeptId() == 0L) {
+            List<SysDept> userList = userMapper.getTree(dept);
+            return buildDeptTreeSelect(userList);
+        }
         List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
         for (SysDept sysDept : depts) {
             SysUser paramUser = new SysUser();
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
index 62b3b11..3130283 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -206,6 +206,29 @@
           and del_flag = '0' limit 1
     </select>
 
+    <select id="getTree" resultType="com.bonus.system.api.domain.SysDept">
+        SELECT
+            *
+        FROM
+            (
+                SELECT
+                    d.dept_id AS deptId,
+                    d.parent_id AS parentId,
+                    d.dept_name AS deptName
+                FROM sys_dept d
+                WHERE d.del_flag = '0'
+                  AND d.STATUS = '0'
+                UNION
+                SELECT
+                    su.user_id AS deptId,
+                    su.dept_id AS parentId,
+                    su.nick_name AS deptName
+                FROM sys_user su
+                         LEFT JOIN sys_dept sd ON su.dept_id = sd.dept_id
+                WHERE su.del_flag = '0'
+            ) AS combined_results
+    </select>
+
     <insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
         insert into sys_user(
         <if test="userId != null and userId != 0">user_id,</if>