From 0902ca2bef5791766bc9eb7a96f75ab71c813dc5 Mon Sep 17 00:00:00 2001
From: liux <963924687@qq.com>
Date: Mon, 5 Jan 2026 10:10:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E6=96=B0=E5=A2=9E=E3=80=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81=E6=9F=A5=E8=AF=A2=20=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0org=5Fid=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/api/domain/SysUser.java   | 12 +++++++++++-
 .../main/resources/mapper/system/SysUserMapper.xml  | 13 +++++++++----
 2 files changed, 20 insertions(+), 5 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 33c6fb7..6c5ae4c 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
@@ -6,6 +6,7 @@ import com.bonus.common.core.annotation.Excel.Type;
 import com.bonus.common.core.annotation.Excels;
 import com.bonus.common.core.web.domain.BaseEntity;
 import com.bonus.common.core.xss.Xss;
+import lombok.Getter;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -41,6 +42,11 @@ public class SysUser extends BaseEntity {
     @Excel(name = "部门编号", type = Type.IMPORT)
     private Long deptId;
 
+
+    @Getter
+    @Excel(name = "组织编号", type = Type.IMPORT)
+    private Long orgId;
+
     /**
      * 公司ID
      */
@@ -154,7 +160,11 @@ public class SysUser extends BaseEntity {
 
     /**是否内置，0内置，1非内置*/
     private String isBuiltIn = "1";
-      private  Long orgId;
+
+
+    public void setOrgId(Long orgId) {
+        this.orgId = orgId;
+    }
 
     public 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 60f6796..e91c732 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
@@ -26,6 +26,7 @@
         <result property="approvalStatus" column="approval_status"/>
         <result property="isPermanent" column="is_permanent"/>
         <result property="isBuiltIn" column="is_built_in"/>
+        <result property="orgId" column="org_id"/>
         <association property="dept" javaType="SysDept" resultMap="deptResult"/>
         <collection property="roles" javaType="java.util.List" resultMap="RoleResult"/>
 
@@ -54,6 +55,7 @@
         select u.user_id,
                u.dept_id,
                u.dept_id as companyId,
+               u.org_id,
                u.user_name,
                u.nick_name,
                u.phonenumber,
@@ -90,7 +92,7 @@
     </sql>
 
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name,  -- 手机号脱敏：保留前3位和后4位，中间用****替换
+        select u.user_id, u.dept_id, u.org_id,u.nick_name, u.user_name,  -- 手机号脱敏：保留前3位和后4位，中间用****替换
         CONCAT(LEFT(u.phonenumber, 3), '****', RIGHT(u.phonenumber, 4)) AS phonenumber,u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in, d.dept_name,
         d.leader,r.role_id,
@@ -171,7 +173,7 @@
 <!--    </select>-->
 
     <select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in
+        select distinct u.user_id, u.dept_id, u.org_id,u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
@@ -188,7 +190,7 @@
     </select>
 
     <select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
-        select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in
+        select distinct u.user_id, u.dept_id, u.org_id,u.user_name, u.nick_name, u.phonenumber, u.status, u.create_time,u.is_built_in
         from sys_user u
         left join sys_dept d on u.dept_id = d.dept_id
         left join sys_user_role ur on u.user_id = ur.user_id
@@ -244,7 +246,7 @@
 
 
     <select id="getList" parameterType="SysUser" resultMap="SysUserResult">
-        select u.user_id, u.dept_id, u.nick_name, u.user_name, u.phonenumber,u.sex, u.status,
+        select u.user_id, u.dept_id, u.org_id, u.nick_name, u.user_name, u.phonenumber,u.sex, u.status,
         u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark,u.approval_status,u.is_permanent,u.is_built_in, d.dept_name,
         d.leader,r.role_id,
         r.role_name,
@@ -311,6 +313,7 @@
         <if test="approvalStatus != null and approvalStatus!=''">approval_status,</if>
         <if test="isPermanent != null and isPermanent!=''">is_permanent,</if>
         <if test="isBuiltIn != null and isBuiltIn!=''">is_built_in,</if>
+        <if test="orgId != null and orgId!=''">org_id,</if>
         create_time
         )values(
         <if test="userId != null and userId != ''">#{userId},</if>
@@ -327,6 +330,7 @@
         <if test="approvalStatus != null and approvalStatus!=''">#{approvalStatus},</if>
         <if test="isPermanent != null and isPermanent!=''">#{isPermanent},</if>
         <if test="isBuiltIn != null and isBuiltIn!=''">#{isBuiltIn},</if>
+        <if test="orgId != null and orgId!=''">#{orgId},</if>
         sysdate()
         )
     </insert>
@@ -348,6 +352,7 @@
             <if test="loginType != null and loginType!=''">login_type = #{loginType},</if>
             <if test="isPermanent != null and isPermanent!=''">is_permanent = #{isPermanent},</if>
             <if test="isBuiltIn != null and isBuiltIn!=''">is_built_in = #{isBuiltIn},</if>
+            <if test="orgId != null and orgId!=''">org_id = #{orgId},</if>
             update_time = sysdate()
         </set>
         where user_id = #{userId}