From 6aa659f6cb7d3c86c87c4ab58be4220820c7326b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 25 十月 2024 19:37:07 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
index c65349e..c5fbbd1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TFoundationPersonServiceImpl.java
@@ -2,13 +2,16 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.system.domain.TFoundationConfig;
import com.ruoyi.system.domain.TFoundationPerson;
import com.ruoyi.system.dto.TFoundationPersonDTO;
import com.ruoyi.system.mapper.TFoundationPersonMapper;
+import com.ruoyi.system.query.TFoundationPersonQuery;
import com.ruoyi.system.service.TFoundationConfigService;
import com.ruoyi.system.service.TFoundationPersonService;
+import com.ruoyi.system.vo.SysUserVO;
import com.ruoyi.system.vo.TFoundationPersonVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -84,8 +87,9 @@
}
@Override
- public List<TFoundationPersonVO> getList() {
- List<TFoundationPersonVO> list = this.baseMapper.getList();
+ public PageInfo<TFoundationPersonVO> getList(TFoundationPersonQuery query) {
+ PageInfo<TFoundationPersonVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TFoundationPersonVO> list = this.baseMapper.getList(query,pageInfo);
List<Long> ids = list.stream().map(TFoundationPersonVO::getId).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(ids)){
List<TFoundationConfig> list1 = foundationConfigService.list(Wrappers.lambdaQuery(TFoundationConfig.class)
@@ -99,6 +103,7 @@
}
});
}
- return list;
+ pageInfo.setRecords(list);
+ return pageInfo;
}
}
--
Gitblit v1.7.1