From 167e762a1324e55691b992a5510244bde5b20d42 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Wed, 31 May 2023 02:59:02 +0800 Subject: [PATCH] Fixed pagination in UserManagement --- .../mapper/permission/UserMapper.java | 2 + .../permission/impl/UserServiceImpl.java | 1 + .../mapper/permission/UserMapper.xml | 171 ++++++++++-------- 3 files changed, 96 insertions(+), 78 deletions(-) diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java index 691ad9b..81f12c2 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/UserMapper.java @@ -20,6 +20,8 @@ import java.util.List; public interface UserMapper extends BaseMapper { IPage getAll(IPage page); + List getAllWithRoleAndGroup(@Param("userList") List userList); + List getAllAffairUser(); List getAllDepartmentUser(@Param("departmentId")long departmentId); diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java index 1ba34be..017f1fd 100644 --- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java +++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/UserServiceImpl.java @@ -93,6 +93,7 @@ public class UserServiceImpl extends ServiceImpl implements IU public IPage getAllUser(Long currentPage, Long pageSize) { IPage userPage = PageDTO.of(currentPage, pageSize); userPage = userMapper.getAll(userPage); + userPage.setRecords(userMapper.getAllWithRoleAndGroup(userPage.getRecords())); userPage.getRecords().forEach(user -> { if (user.getId() == 1L) { user.setRoles(List.of(new Role(0L, "超级管理员"))); diff --git a/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml index a033edf..4003c5f 100644 --- a/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml +++ b/Pinnacle/src/main/resources/mapper/permission/UserMapper.xml @@ -2,34 +2,51 @@ - + 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, - ts.id as staff_id, - ts.first_name as staff_first_name, - ts.last_name as staff_last_name, - ts.deleted as staff_deleted, - ts.version as staff_version, - tr.id as role_id, - tr.enable as role_enable, - tr.name as role_name, - tr.deleted as role_deleted, - tr.version as role_version, - tg.id as group_id, - tg.name as group_name, - tg.enable as group_enable, - tg.deleted as group_deleted, - tg.version as group_version + t_user.version as user_version + from t_user + where deleted = 0 + + + select t_user.id as user_id, - t_user.username as user_username, - t_user.passwd as user_passwd, - 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, - ts.id as staff_id, - ts.first_name as staff_first_name, - ts.last_name as staff_last_name, - ts.deleted as staff_deleted, - ts.version as staff_version, - tm.id as menu_id, - tm.name as menu_name, - tm.url as menu_url, - tm.power_id as menu_power_id, - tm.parent_id as menu_parent_id, - te.id as element_id, - te.name as element_name, - te.power_id as element_power_id, - te.menu_id as element_menu_id, - t.id as operation_id, - t.name as operation_name, - t.code as operation_code, - t.power_id as operation_power_id, - t.element_id as operation_element_id, - t.parent_id as operation_parent_id + t_user.username as user_username, + t_user.passwd as user_passwd, + 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, + ts.id as staff_id, + ts.first_name as staff_first_name, + ts.last_name as staff_last_name, + ts.deleted as staff_deleted, + ts.version as staff_version, + tm.id as menu_id, + tm.name as menu_name, + tm.url as menu_url, + tm.power_id as menu_power_id, + tm.parent_id as menu_parent_id, + te.id as element_id, + te.name as element_name, + te.power_id as element_power_id, + te.menu_id as element_menu_id, + t.id as operation_id, + t.name as operation_name, + t.code as operation_code, + t.power_id as operation_power_id, + t.element_id as operation_element_id, + t.parent_id as operation_parent_id from t_user left join (select * from t_staff where deleted = 0) as ts on ts.user_id = t_user.id left join (select * from t_user_group where deleted = 0) as tug on t_user.id = tug.user_id left join (select * from t_group where deleted = 0 and enable = 1) as tg on tg.id = tug.group_id left join (select * from t_role_group where deleted = 0) as trg on tg.id = trg.group_id left join (select * from t_user_role where deleted = 0) as tur on t_user.id = tur.user_id - left join (select * from t_role where deleted = 0 and enable = 1) as tr on tr.id = trg.role_id or tr.id = tur.role_id + left join (select * from t_role where deleted = 0 and enable = 1) as tr + on tr.id = trg.role_id or tr.id = tur.role_id left join (select * from t_power_role where deleted = 0) as tpr on tpr.role_id = tr.id left join t_power as tp on tp.id = tpr.power_id left join t_menu tm on tp.id = tm.power_id @@ -110,26 +128,26 @@ - + + + + @@ -210,14 +231,8 @@ - - - + - - - -