From 7b36013a20c3113a2d66033371d289b8da678b29 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期三, 30 八月 2023 18:20:17 +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