From 848d609a35569b029bbdd5ab91c1df2a0f568819 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 09 一月 2026 09:04:03 +0800
Subject: [PATCH] 浪潮对接单点登录:租户数据隔离功能3

---
 src/main/resources/mapper/system/SysDeptMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/resources/mapper/system/SysDeptMapper.xml b/src/main/resources/mapper/system/SysDeptMapper.xml
index efebac7..aedb633 100644
--- a/src/main/resources/mapper/system/SysDeptMapper.xml
+++ b/src/main/resources/mapper/system/SysDeptMapper.xml
@@ -67,7 +67,7 @@
 	</select>
     
     <select id="checkDeptExistUser" parameterType="Long" resultType="int">
-		select count(1) from sys_user where dept_id = #{deptId} and del_flag = '0'
+		select count(1) from sys_user_dept where dept_id = #{deptId}
 	</select>
 	
 	<select id="hasChildByDeptId" parameterType="Long" resultType="int">
@@ -99,6 +99,7 @@
  			<if test="phone != null and phone != ''">phone,</if>
  			<if test="email != null and email != ''">email,</if>
 		    <if test="deptNick != null and deptNick != ''">dept_nick,</if>
+		    <if test="tenantId != null and tenantId != ''">tenant_id,</if>
  			<if test="status != null">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			create_time
@@ -112,6 +113,7 @@
  			<if test="phone != null and phone != ''">#{phone},</if>
  			<if test="email != null and email != ''">#{email},</if>
 		    <if test="deptNick != null and deptNick != '' ">#{deptNick},</if>
+		    <if test="tenantId != null and tenantId != '' ">#{tenantId},</if>
  			<if test="status != null">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			sysdate()
@@ -130,6 +132,7 @@
  			<if test="email != null">email = #{email},</if>
 			<if test="deptNick != null and deptNick != '' ">dept_nick = #{deptNick},</if>
  			<if test="status != null and status != ''">status = #{status},</if>
+ 			<if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
  			<if test="updateBy != null and updateBy != ''">update_by = #{updateBy},</if>
  			update_time = sysdate()
  		</set>
@@ -178,5 +181,10 @@
 		FROM DepartmentHierarchy
 		WHERE parent_id = 100;
 	</select>
+    <select id="selectDeptByDeptName" resultType="com.ruoyi.project.system.domain.SysDept">
+        <include refid="selectDeptVo"/>
+        WHERE d.dept_name = #{deptName}
+        LIMIT 1
+    </select>
 
 </mapper> 
\ No newline at end of file

--
Gitblit v1.9.3