From 4556d14b99432b90f18976e29ed8374bdf30f142 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 16 三月 2026 10:22:28 +0800
Subject: [PATCH] fix: 基础参数查询添加分页
---
src/main/java/com/ruoyi/basic/controller/BaseParamController.java | 8 +++++---
src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java | 14 ++++++++------
src/main/java/com/ruoyi/basic/service/BaseParamService.java | 4 +++-
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/controller/BaseParamController.java b/src/main/java/com/ruoyi/basic/controller/BaseParamController.java
index 08f3df0..59018d5 100644
--- a/src/main/java/com/ruoyi/basic/controller/BaseParamController.java
+++ b/src/main/java/com/ruoyi/basic/controller/BaseParamController.java
@@ -1,5 +1,7 @@
package com.ruoyi.basic.controller;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.pojo.BaseParam;
import com.ruoyi.basic.service.BaseParamService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
@@ -31,9 +33,9 @@
@GetMapping("list")
@Log(title = "鍩虹鍙傛暟鏁版嵁闆嗗悎", businessType = BusinessType.OTHER)
@ApiOperation("鍩虹鍙傛暟鏁版嵁闆嗗悎")
- public AjaxResult baseParamList(BaseParam baseParam) {
- List<BaseParam> list = baseParamService.baseParamList(baseParam);
- return AjaxResult.success(list);
+ public AjaxResult baseParamList(Page<BaseParam> page, BaseParam baseParam) {
+ IPage<BaseParam> paramList = baseParamService.baseParamList(page, baseParam);
+ return AjaxResult.success(paramList);
}
@PostMapping("/add")
diff --git a/src/main/java/com/ruoyi/basic/service/BaseParamService.java b/src/main/java/com/ruoyi/basic/service/BaseParamService.java
index ee50e5a..9a56d28 100644
--- a/src/main/java/com/ruoyi/basic/service/BaseParamService.java
+++ b/src/main/java/com/ruoyi/basic/service/BaseParamService.java
@@ -1,5 +1,7 @@
package com.ruoyi.basic.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.basic.pojo.BaseParam;
@@ -15,7 +17,7 @@
* @since 2026/03/13 16:40
*/
public interface BaseParamService extends IService<BaseParam> {
- List<BaseParam> baseParamList(BaseParam baseParam);
+ IPage<BaseParam> baseParamList(Page<BaseParam> page, BaseParam baseParam);
int addBaseParam(BaseParam baseParam);
diff --git a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
index 10cc41e..74f68be 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/BaseParamServiceImpl.java
@@ -1,6 +1,8 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.mapper.BaseParamMapper;
import com.ruoyi.basic.pojo.BaseParam;
@@ -32,24 +34,24 @@
public class BaseParamServiceImpl extends ServiceImpl<BaseParamMapper, BaseParam> implements BaseParamService {
@Override
- public List<BaseParam> baseParamList(BaseParam baseParam) {
+ public IPage<BaseParam> baseParamList(Page<BaseParam> page, BaseParam baseParam) {
LambdaQueryWrapper<BaseParam> queryWrapper = new LambdaQueryWrapper<>();
if (StringUtils.isNotEmpty(baseParam.getParamName())) {
queryWrapper.like(BaseParam::getParamName, baseParam.getParamName());
}
- List<BaseParam> list = list(queryWrapper);
- if (list == null || list.isEmpty()) {
- return new ArrayList<>(0);
+ Page<BaseParam> paramPage = page(page, queryWrapper);
+ if (paramPage == null || paramPage.getRecords().isEmpty()) {
+ return new Page<>();
}
// 澶勭悊鏃ユ湡鏍煎紡灞曠ず
- list.forEach(item -> {
+ paramPage.getRecords().forEach(item -> {
if (Integer.valueOf(4).equals(item.getParamType()) && StringUtils.isNotEmpty(item.getParamFormat())) {
item.setParamFormat(toUpperCasePattern(item.getParamFormat()));
}
});
- return list;
+ return paramPage;
}
@Override
--
Gitblit v1.9.3