From 4a8f0224f5beac7a3801d9412a5a3f79e3054361 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sun, 1 Dec 2024 15:43:37 +0800
Subject: [PATCH] add companyId to sysUser

---
 .../java/com/bonus/system/api/domain/SysUser.java  | 14 ++++++++++++++
 .../main/resources/mapper/system/SysUserMapper.xml |  7 +++++++
 2 files changed, 21 insertions(+)

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 1fcf2fc..61627be 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
@@ -38,6 +38,12 @@ public class SysUser extends BaseEntity {
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
+    /**
+     * 公司ID
+     */
+    @Excel(name = "公司编号", type = Type.IMPORT)
+    private Long companyId;
+
     /**
      * 用户账号
      */
@@ -179,6 +185,14 @@ public class SysUser extends BaseEntity {
         this.deptId = deptId;
     }
 
+    public Long getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(Long companyId) {
+        this.companyId = companyId;
+    }
+
     @Xss(message = "用户昵称不能包含脚本字符")
     @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符")
     public String getNickName() {
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 157ee17..6654a9c 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
@@ -7,6 +7,7 @@
     <resultMap type="SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
         <result property="deptId" column="dept_id"/>
+        <result property="companyId" column="company_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="email" column="email"/>
@@ -54,6 +55,12 @@
     <sql id="selectUserVo">
         select u.user_id,
                u.dept_id,
+               CASE d.ancestors
+                   WHEN ('0') THEN
+                       d.dept_id
+                   ELSE
+                       SUBSTRING_INDEX(SUBSTRING_INDEX(d.ancestors, ',', 2), ',', -1)
+                   END as company_id,
                u.user_name,
                u.nick_name,
                u.email,