FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-05 23:11:24 +08:00
Code Packages Releases Activity

Optimized pagination in UserManagement

Browse Source
This commit is contained in:
Fat Snake
2023-06-01 18:15:59 +08:00
parent bf88054c35
commit 0a3d256ecf
3 changed files with 1 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java
View File

@@ -1,6 +1,5 @@
package com.cfive.pinnacle.mapper.permission; package com.cfive.pinnacle.mapper.permission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cfive.pinnacle.entity.permission.User; import com.cfive.pinnacle.entity.permission.User;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
@@ -18,8 +17,6 @@ import java.util.List;
*/ */
@Mapper @Mapper
public interface UserMapper extends BaseMapper<User> { public interface UserMapper extends BaseMapper<User> {
IPage<User> getAll(IPage<User> page);
List<User> getAllWithRoleAndGroup(@Param("userList") List<User> userList); List<User> getAllWithRoleAndGroup(@Param("userList") List<User> userList);
List<User> getAllAffairUser(); List<User> getAllAffairUser();

2
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java
View File

@@ -92,7 +92,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
@Override @Override
public IPage<User> getAllUser(Long currentPage, Long pageSize) { public IPage<User> getAllUser(Long currentPage, Long pageSize) {
IPage<User> userPage = PageDTO.of(currentPage, pageSize); IPage<User> userPage = PageDTO.of(currentPage, pageSize);
userPage = userMapper.getAll(userPage); userPage = userMapper.selectPage(userPage, Wrappers.emptyWrapper());
userPage.setRecords(userMapper.getAllWithRoleAndGroup(userPage.getRecords())); userPage.setRecords(userMapper.getAllWithRoleAndGroup(userPage.getRecords()));
userPage.getRecords().forEach(user -> { userPage.getRecords().forEach(user -> {
if (user.getId() == 1L) { if (user.getId() == 1L) {

11
Pinnacle/src/main/resources/mapper/permission/UserMapper.xml
View File

@@ -2,17 +2,6 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.permission.UserMapper"> <mapper namespace="com.cfive.pinnacle.mapper.permission.UserMapper">
<select id="getAll" resultMap="userBase">
select t_user.id as user_id,
t_user.username as user_username,
t_user.department_id as user_department_id,
t_user.enable as user_enable,
t_user.deleted as user_deleted,
t_user.version as user_version
from t_user
where deleted = 0
</select>
<select id="getAllWithRoleAndGroup" resultMap="userMap"> <select id="getAllWithRoleAndGroup" resultMap="userMap">
select distinct t_user.id as user_id, select distinct t_user.id as user_id,
t_user.username as user_username, t_user.username as user_username,