From 5a877284e06eb1cfe5d862ff755ad105fc6a7c3c Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 31 八月 2023 10:57:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml | 2 +-
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java
index 9cc7e49..f99941a 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java
@@ -9,6 +9,7 @@
import com.vci.ubcs.system.mapper.CombinationMapper;
import com.vci.ubcs.system.service.ICombinationService;
import org.springblade.core.cache.utils.CacheUtil;
+import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.utils.Func;
import org.springframework.stereotype.Service;
import org.springframework.validation.annotation.Validated;
@@ -55,7 +56,9 @@
*/
@Override
public IPage<Combination> selectCombinationPage(Combination combination, IPage<Combination> page) {
- return page.setRecords(combinationMapper.selectCombinationPage(page,combination));
+ IPage<Combination> combinationIPage = combinationMapper.selectPage(page, Condition.getQueryWrapper(combination));
+ // page.setRecords(combinationMapper.selectCombinationPage(page,combination))
+ return combinationIPage;
}
/**
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 db530ed..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 listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
+ (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
--
Gitblit v1.9.3