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/CombinationMapper.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml
index 71feaf0..657e646 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/CombinationMapper.xml
@@ -88,7 +88,7 @@
     </select>
 
     <select id="queryRegex" resultType="java.lang.String">
-        SELECT CONCAT(REPLACE(WM_CONCAT(psc.REGEX),',[',''),']') FROM PL_SYS_COMBINATION psc
+        SELECT REPLACE(listagg(psc.REGEX,'],') within group ( order by psc.REGEX) || ']','],[','') FROM PL_SYS_COMBINATION psc
         WHERE psc.ID IN (
         <foreach collection="combinationIds" item="id" separator=",">
             #{id}

--
Gitblit v1.9.3