From 450db962c4bc94de0cb0aacf47ba12ec314961d3 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 08 十二月 2023 11:29:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 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 29894ee..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
@@ -25,10 +25,15 @@
<!--鏌ヨ鎸囧畾琛屾暟鎹�-->
<select id="queryAllByPage" resultMap="StrategyMap">
select pss.*,
- (SELECT listagg(psc.NAME,',') within GROUP BY(ORDER BY psc.NAME asc)
+ (SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
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 != ''">
+ TENANT_ID = #{tenantId}
+ </if>
+ </where>
</select>
<!--缁熻鎬昏鏁�-->
@@ -87,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
@@ -112,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