From 1a49cce3da262283aaafec2db40213c347f1877c Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Thu, 20 Mar 2025 10:10:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89firstleveldept?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/api/domain/SysUser.java  | 14 --------------
 .../system/service/impl/SysDeptServiceImpl.java    |  1 -
 .../main/resources/mapper/system/SysUserMapper.xml |  7 -------
 3 files changed, 22 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
index 7f4b803..def1c70 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysUser.java
@@ -50,12 +50,6 @@ public class SysUser extends BaseEntity {
     @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long companyId;
 
-    /**
-     * 根公司下第一级分公司的deptId
-     */
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private Long firstLevelDeptId;
-
     /**
      * 用户账号
      */
@@ -228,14 +222,6 @@ public class SysUser extends BaseEntity {
         this.companyId = companyId;
     }
 
-    public Long getFirstLevelDeptId() {
-        return firstLevelDeptId;
-    }
-
-    public void setFirstLevelDeptId(Long firstLevelDeptId) {
-        this.firstLevelDeptId = firstLevelDeptId;
-    }
-
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 200, message = "用户昵称长度不能超过200个字符")
     public String getNickName() {
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 be64605..8519a5f 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
@@ -88,7 +88,6 @@ public class SysDeptServiceImpl implements ISysDeptService
             dept.setDeptName(str);
         }
         dept.setCompanyId(SecurityUtils.getLoginUser().getSysUser().getCompanyId());
-        //dept.setDeptId(SecurityUtils.getLoginUser().getSysUser().getFirstLevelDeptId());
         return deptMapper.selectDeptList(dept);
     }
 
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 4057fa8..e460200 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
@@ -8,7 +8,6 @@
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
         <result property="companyId" column="company_id"/>
-        <result property="firstLevelDeptId" column="first_level_dept_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="email" column="email"/>
@@ -66,12 +65,6 @@
                    ELSE
                        SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 2), ',', -1)
                    END as company_id,
---                CASE
---                    WHEN (LENGTH(d.ancestors) - LENGTH(REPLACE(d.ancestors, ',', ''))) = 1 THEN
---                        d.dept_id
---                    ELSE
---                        SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 3), ',', -1)
---                    END as first_level_dept_id,
                u.user_name,
                u.nick_name,
                u.email,