From 4a2835ddadb796c69f180097b95f971dbab4687d Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 九月 2023 09:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 50d4a67..f7043dd 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
@@ -30,9 +30,9 @@
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>
+ <if test="tenantId != null and tenantId != ''">
+ TENANT_ID = #{tenantId}
+ </if>
</where>
</select>
@@ -92,7 +92,6 @@
</where>
</select>
-
<select id="queryByNameAndTenantId" resultMap="StrategyMap">
SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
from PL_SYS_COMBINATION psc
@@ -117,6 +116,9 @@
WHERE instr(pss.COMBINATION_IDS, psc.ID) > 0) COMBINATIONNAMES
FROM PL_SYS_PWDSTRATEGY PSS
WHERE is_default = 1
+ <if test="tenantId != null and tenantId != ''">
+ and TENANT_ID = #{tenantId}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3