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

Added pagination to UserManagement

Browse Source
This commit is contained in:
Fat Snake
2023-05-31 00:41:58 +08:00
parent 102267ffd2
commit 7d11af0c31
7 changed files with 101 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,7 +3,7 @@
<mapper namespace="com.cfive.pinnacle.mapper.permission.UserMapper">
<select id="getAll" resultMap="userMap">
select t_user.id as user_id,
select distinct 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,
@@ -24,13 +24,12 @@
tg.enable as group_enable,
tg.deleted as group_deleted,
tg.version as group_version
from t_user
from (select * from t_user where deleted = 0) as 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_role where deleted = 0) as tur on t_user.id = tur.user_id
left join (select * from t_role where deleted = 0) as tr on tr.id = tur.role_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) as tg on tg.id = tug.group_id
where t_user.deleted = 0;
</select>
<select id="getOneById" resultMap="userMap">
@@ -62,11 +61,11 @@
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) as tg on tg.id = tug.group_id
where t_user.deleted = 0
and t_user.id = #{id};
and t_user.id = #{id}
</select>
<select id="getOneWithPowerByUsername" resultMap="userWithPowerMap">
select distinct t_user.id as user_id,
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,
@@ -106,11 +105,11 @@
left join t_element te on tp.id = te.power_id
left join t_operation t on tp.id = t.power_id
where t_user.deleted = 0
and t_user.username = #{username};
and t_user.username = #{username}
</select>
<select id="getAllAffairUser" resultMap="userMap">
select t_user.id as user_id,
select distinct 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,
@@ -142,31 +141,31 @@
left join (select * from t_operation) as t on t.power_id = tp.id
where t_user.deleted = 0
and t_user.id != 1
and t.code = 'affair:manage:modify';
and t.code = 'affair:manage:modify'
</select>
<select id="getAllDepartmentUser" resultMap="userMap">
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
select distinct 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
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_role where deleted = 0) as tur on t_user.id = tur.user_id
@@ -178,7 +177,7 @@
left join (select * from t_operation) as t on t.power_id = tp.id
where t_user.deleted = 0
and t_user.id != 1
and t_user.department_id = #{departmentId};
and t_user.department_id = #{departmentId}
</select>
<resultMap id="userMap" type="user">