From 5ba39c00863e59aae33d06416a253827b9463ae7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 03 十二月 2021 15:57:58 +0800
Subject: [PATCH] update 重构分页 基于 分页新方法
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index 298e506..ef32fd1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -2,8 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.DataScope;
import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
@@ -18,7 +20,6 @@
import com.ruoyi.system.domain.SysUserPost;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.*;
-import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,13 +51,11 @@
@Autowired
private SysUserPostMapper userPostMapper;
- @Autowired
- private ISysConfigService configService;
-
@Override
@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
- public TableDataInfo<SysUser> selectPageUserList(SysUser user) {
- return PageUtils.buildDataInfo(baseMapper.selectPageUserList(PageUtils.buildPage(), user));
+ public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
+ Page<SysUser> page = baseMapper.selectPageUserList(PageUtils.buildPage(pageQuery), user);
+ return PageUtils.buildDataInfo(page);
}
/**
@@ -79,8 +78,9 @@
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
- public TableDataInfo<SysUser> selectAllocatedList(SysUser user) {
- return PageUtils.buildDataInfo(baseMapper.selectAllocatedList(PageUtils.buildPage(), user));
+ public TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery) {
+ Page<SysUser> page = baseMapper.selectAllocatedList(PageUtils.buildPage(pageQuery), user);
+ return PageUtils.buildDataInfo(page);
}
/**
@@ -91,8 +91,9 @@
*/
@Override
@DataScope(deptAlias = "d", userAlias = "u", isUser = true)
- public TableDataInfo<SysUser> selectUnallocatedList(SysUser user) {
- return PageUtils.buildDataInfo(baseMapper.selectUnallocatedList(PageUtils.buildPage(), user));
+ public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
+ Page<SysUser> page = baseMapper.selectUnallocatedList(PageUtils.buildPage(pageQuery), user);
+ return PageUtils.buildDataInfo(page);
}
/**
--
Gitblit v1.9.3