From 0178d9e48a87629f8b5f5f5075409d9ab6d29d87 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 30 八月 2023 17:24:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
index 559bcbd..020ff7e 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/resources/mapper/UserMapper.xml
@@ -39,11 +39,8 @@
LEFT JOIN PL_SYS_USER_PWDSTRATEGY plup on plup.USER_ID=pou.ID
LEFT JOIN PL_SYS_PWDSTRATEGY pss on pss.ID=plup.PWDSTRATEGY_ID
WHERE is_deleted = 0
- <if test="tenantId!=null and tenantId != ''">
- and tenant_id = #{tenantId}
- </if>
<if test="user.tenantId!=null and user.tenantId != ''">
- and tenant_id = #{user.tenantId}
+ and pou.tenant_id = #{user.tenantId}
</if>
<if test="user.account!=null and user.account != ''">
and account = #{user.account}
--
Gitblit v1.9.3