From 01714a991da91ab16cdc8eec25a40e12123d7ff6 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 31 八月 2023 09:49:30 +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, 5 insertions(+), 5 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 83969fb..29894ee 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,7 +25,7 @@
<!--鏌ヨ鎸囧畾琛屾暟鎹�-->
<select id="queryAllByPage" resultMap="StrategyMap">
select pss.*,
- (select WM_CONCAT(psc.NAME)
+ (SELECT listagg(psc.NAME,',') within GROUP BY(ORDER BY psc.NAME asc)
from PL_SYS_COMBINATION psc
where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
from PL_SYS_PWDSTRATEGY pss
@@ -89,17 +89,17 @@
<select id="queryByNameAndTenantId" resultMap="StrategyMap">
- SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+ SELECT PSS.*,(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
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">
- SELECT PSS.*,(select WM_CONCAT(psc.NAME)
+ SELECT PSS.*,(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 LEFT JOIN PL_SYS_USER_PWDSTRATEGY PSUP ON PSS.ID=psup.PWDSTRATEGY_ID
@@ -107,7 +107,7 @@
</select>
<select id="queryByIsDefault" resultType="com.vci.ubcs.system.entity.Strategy">
- SELECT PSS.*,(SELECT WM_CONCAT(psc.NAME)
+ SELECT PSS.*,(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
--
Gitblit v1.9.3