From 5021c02115c040c78b9bf015ef100a79de26c638 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sun, 5 Jan 2025 20:00:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E5=8F=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bonus/system/api/domain/SysDept.java    | 11 +++++++++++
 .../system/service/impl/SysDeptServiceImpl.java      |  2 ++
 .../main/resources/mapper/system/SysDeptMapper.xml   | 12 ++++++------
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
index 9e82604..6b8e582 100644
--- a/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
+++ b/bonus-api/bonus-api-system/src/main/java/com/bonus/system/api/domain/SysDept.java
@@ -110,6 +110,9 @@ public class SysDept extends BaseEntity {
      */
     private String logo;
 
+    //公司管理员用户ID
+    private Long adminUserId;
+
     /**
      * 公司用户初始密码
      */
@@ -198,6 +201,14 @@ public class SysDept extends BaseEntity {
         this.logo = logo;
     }
 
+    public Long getAdminUserId() {
+        return adminUserId;
+    }
+
+    public void setAdminUserId(Long adminUserId) {
+        this.adminUserId = adminUserId;
+    }
+
     public String getInitPassword() {
         return initPassword;
     }
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 5d0c714..c973bb4 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
@@ -451,6 +451,8 @@ public class SysDeptServiceImpl implements ISysDeptService
         user.setPassword(SecurityUtils.encryptPassword(dept.getInitPassword()));
         user.setDeptId(dept.getDeptId());
         userMapper.insertUser(user);
+        dept.setAdminUserId(user.getUserId());
+        deptMapper.updateDept(dept);
         return user;
     }
 
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
index 9a2b055..11e5fff 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="deptAbbreviation" column="dept_abbreviation" />
 		<result property="remark" column="remark" />
 		<result property="logo" column="logo" />
+		<result property="adminUserId" column="admin_user_id" />
 		<result property="initPassword" column="init_password" />
 	</resultMap>
 
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			   d.dept_abbreviation,
 			   d.remark,
 			   d.logo,
+			   d.admin_user_id,
 			   d.init_password
         from sys_dept d
     </sql>
@@ -226,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="deptAbbreviation != null and deptAbbreviation != ''">dept_abbreviation = #{deptAbbreviation},</if>
 			<if test="remark != null and remark != ''">remark = #{remark},</if>
 			<if test="logo != null and logo != ''">logo = #{logo},</if>
+			<if test="adminUserId != null and adminUserId != 0">admin_user_id = #{adminUserId},</if>
 			<if test="initPassword != null and initPassword != ''">init_password = #{initPassword},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
@@ -260,12 +263,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="selectCompanyAdminByDept" resultType="com.bonus.system.api.domain.SysUser">
 		select su.nick_name as nickName, su.user_name as userName, su.phonenumber as phonenumber,
-			   su.user_id as userId, sr.role_id as roleId, sd.dept_id as deptId
+			   su.user_id as userId, sd.dept_id as deptId
 		from sys_dept sd
-			left join sys_role_dept srd on sd.dept_id = srd.dept_id
-			left join sys_role sr on srd.role_id = sr.role_id
-			left join sys_user_role sur on sur.role_id = sr.role_id
-			left join sys_user su on su.user_id = sur.user_id
-		where sd.dept_id = #{deptId} and sr.role_key LIKE 'company_%_admin'
+			left join sys_user su on su.user_id = sd.admin_user_id
+		where sd.dept_id =  #{deptId}
 	</select>
 </mapper>