From ba4af275c3b8d073f863be7b12e43974b3ef14a2 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 12 七月 2025 10:27:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/product-inventory-management-after into pim_ly

---
 src/main/resources/mapper/system/SysUserMapper.xml |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/system/SysUserMapper.xml b/src/main/resources/mapper/system/SysUserMapper.xml
index 8e9ec54..52ec0a3 100644
--- a/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/src/main/resources/mapper/system/SysUserMapper.xml
@@ -62,12 +62,14 @@
 			FROM
 				sys_user_dept T1
 			LEFT JOIN sys_dept T2 ON T1.dept_id = T2.dept_id
+		<where>
+			<if test="tenantId != null and tenantId != 0">
+				T1.dept_id = #{tenantId}
+			</if>
+		</where>
 			GROUP BY T1.user_id
 		) T2 on T2.user_id = u.user_id
 		where u.del_flag = '0'
-		<if test="tenantId != null and tenantId != 0">
-			and u.tenant_id = #{tenantId}
-		</if>
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>

--
Gitblit v1.9.3