From 9e5b64e1b75ff8969e840011aced580c93721a20 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 15 十二月 2021 23:33:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 3af2fa8..a31b43a 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
@@ -12,7 +12,6 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.exception.ServiceException;
-import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -54,8 +53,8 @@
@Override
public TableDataInfo<SysUser> selectPageUserList(SysUser user, PageQuery pageQuery) {
- Page<SysUser> page = baseMapper.selectPageUserList(PageUtils.buildPage(pageQuery), user);
- return PageUtils.buildDataInfo(page);
+ Page<SysUser> page = baseMapper.selectPageUserList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
}
/**
@@ -77,8 +76,8 @@
*/
@Override
public TableDataInfo<SysUser> selectAllocatedList(SysUser user, PageQuery pageQuery) {
- Page<SysUser> page = baseMapper.selectAllocatedList(PageUtils.buildPage(pageQuery), user);
- return PageUtils.buildDataInfo(page);
+ Page<SysUser> page = baseMapper.selectAllocatedList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
}
/**
@@ -89,8 +88,8 @@
*/
@Override
public TableDataInfo<SysUser> selectUnallocatedList(SysUser user, PageQuery pageQuery) {
- Page<SysUser> page = baseMapper.selectUnallocatedList(PageUtils.buildPage(pageQuery), user);
- return PageUtils.buildDataInfo(page);
+ Page<SysUser> page = baseMapper.selectUnallocatedList(pageQuery.build(), user);
+ return TableDataInfo.build(page);
}
/**
--
Gitblit v1.9.3