From 7d2abb005f5dde19542a2d21c142680098236901 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:56:09 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml | 8 ++++----
1 files changed, 4 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 83969fb..f1f3c9f 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(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,7 +89,7 @@
<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
@@ -99,7 +99,7 @@
</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