From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 22 一月 2025 11:20:41 +0800
Subject: [PATCH] 现场型号代号/人员/组织接口调试
---
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/CombinationServiceImpl.java | 9 +++++++--
1 files changed, 7 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 bd1d59a..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;
}
/**
@@ -110,7 +113,9 @@
*/
@Override
public List<Map<String, Object>> selectMaps() {
- List<Map<String, Object>> maps = listMaps(new QueryWrapper<Combination>().select("ID", "NAME"));
+ List<Map<String, Object>> maps = listMaps(
+ new QueryWrapper<Combination>().lambda().select(Combination::getId, Combination::getName)
+ );
return maps;
}
--
Gitblit v1.9.3