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

Added enable status to Role, Group and User

Browse Source
This commit is contained in:
Fat Snake
2023-05-22 02:04:36 +08:00
parent b9dc1813ba
commit 9a7702efe6
14 changed files with 103 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Pinnacle/src/main/resources/mapper/GroupMapper.xml
View File

@@ -5,6 +5,7 @@
<select id="getAll" resultMap="groupMap">
select t_group.id as group_id,
t_group.name as group_name,
t_group.enable as group_enable,
t_group.deleted as group_deleted,
t_group.version as group_version,
tr.id as role_id,
@@ -20,6 +21,7 @@
<select id="getOneById" resultMap="groupMap">
select t_group.id as group_id,
t_group.name as group_name,
t_group.enable as group_enable,
t_group.deleted as group_deleted,
t_group.version as group_version,
tr.id as role_id,
@@ -38,6 +40,7 @@
<resultMap id="groupMap" type="group">
<id property="id" column="group_id"/>
<result property="name" column="group_name"/>
<result property="enable" column="group_enable"/>
<result property="deleted" column="group_deleted"/>
<result property="version" column="group_version"/>
<collection property="roles" ofType="role">

3
Pinnacle/src/main/resources/mapper/RoleMapper.xml
View File

@@ -5,6 +5,7 @@
<select id="getAll" resultMap="roleMap">
select t_role.id as role_id,
t_role.name as role_name,
t_role.enable as role_enable,
t_role.deleted as role_deleted,
t_role.version as role_version,
tm.id as menu_id,
@@ -33,6 +34,7 @@
<select id="getOneById" resultMap="roleMap">
select t_role.id as role_id,
t_role.name as role_name,
t_role.enable as role_enable,
t_role.deleted as role_deleted,
t_role.version as role_version,
tm.id as menu_id,
@@ -63,6 +65,7 @@
<resultMap id="roleMap" type="role">
<id property="id" column="role_id"/>
<result property="name" column="role_name"/>
<result property="enable" column="role_enable"/>
<result property="deleted" column="role_deleted"/>
<result property="version" column="role_version"/>
<collection property="menus" ofType="menu">

10
Pinnacle/src/main/resources/mapper/UserMapper.xml
View File

@@ -15,11 +15,13 @@
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
@@ -44,10 +46,12 @@
ts.version as staff_version,
tr.id as role_id,
tr.name as role_name,
tr.enable as role_enable,
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
@@ -90,10 +94,10 @@
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) as tg on tg.id = tug.group_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) 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
@@ -120,12 +124,14 @@
<collection property="roles" ofType="role">
<id property="id" column="role_id"/>
<result property="name" column="role_name"/>
<result property="enable" column="role_enable"/>
<result property="deleted" column="role_deleted"/>
<result property="version" column="role_version"/>
</collection>
<collection property="groups" ofType="group">
<id property="id" column="group_id"/>
<result property="name" column="group_name"/>
<result property="enable" column="group_enable"/>
<result property="deleted" column="group_deleted"/>
<result property="version" column="group_version"/>
</collection>