From cb9a46ff1a4e8fd5acd3d4f8012ef733fe426389 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 九月 2023 09:03:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
index f1f3c9f..50d4a67 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
@@ -29,6 +29,11 @@
from PL_SYS_COMBINATION psc
where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
from PL_SYS_PWDSTRATEGY pss
+ <where>
+ <if test="tenantId != null and tenantId != ''">
+ and TENANT_ID = #{tenantId}
+ </if>
+ </where>
</select>
<!--缁熻鎬昏鏁�-->
@@ -95,7 +100,7 @@
FROM PL_SYS_PWDSTRATEGY PSS
LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=PSUP.PWDSTRATEGY_ID
LEFT JOIN PL_ORG_USER POU ON POU.ID=PSUP.USER_ID
- WHERE POU.TENANT_ID = #{tenantId} AND POU.NAME=#{name};
+ WHERE POU.TENANT_ID = #{tenantId} AND POU.ACCOUNT=#{name} AND POU.IS_DELETED = 0;
</select>
<select id="queryByUserId" resultMap="StrategyMap">
--
Gitblit v1.9.3