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 GroupManagement. Fixed some errors in RoleManagement.

Browse Source
This commit is contained in:
Fat Snake
2023-05-16 00:19:14 +08:00
parent a385938cd7
commit b6649df71f
13 changed files with 552 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,4 +2,51 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.cfive.pinnacle.mapper.GroupMapper">
<select id="getAll" resultMap="groupMap">
select t_group.id as group_id,
t_group.name as group_name,
t_group.deleted as group_deleted,
t_group.version as group_version,
tr.id as role_id,
tr.name as role_name,
tr.deleted as role_deleted,
tr.version as role_version
from t_group
left join t_role_group trg on t_group.id = trg.group_id
left join t_role tr on tr.id = trg.role_id
where t_group.deleted = 0
and (tr.deleted = 0 or tr.deleted is null)
and (trg.deleted = 0 or trg.deleted is null)
</select>
<select id="getOneById" resultMap="groupMap">
select t_group.id as group_id,
t_group.name as group_name,
t_group.deleted as group_deleted,
t_group.version as group_version,
tr.id as role_id,
tr.name as role_name,
tr.deleted as role_deleted,
tr.version as role_version
from t_group
left join t_role_group trg on t_group.id = trg.group_id
left join t_role tr on tr.id = trg.role_id
where t_group.deleted = 0
and (tr.deleted = 0 or tr.deleted is null)
and (trg.deleted = 0 or trg.deleted is null)
and t_group.id = #{id}
</select>
<resultMap id="groupMap" type="group">
<id property="id" column="group_id"/>
<result property="name" column="group_name"/>
<result property="deleted" column="group_deleted"/>
<result property="version" column="group_version"/>
<collection property="roles" ofType="role">
<id property="id" column="role_id"/>
<result property="name" column="role_name"/>
<result property="deleted" column="role_deleted"/>
<result property="version" column="role_version"/>
</collection>
</resultMap>
</mapper>

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

@@ -3,32 +3,33 @@
<mapper namespace="com.cfive.pinnacle.mapper.RoleMapper">
<select id="getAll" resultMap="roleMap">
select t_role.id as role_id,
t_role.name as role_name,
select t_role.id as role_id,
t_role.name as role_name,
t_role.deleted as role_deleted,
t_role.version as role_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
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_role
left join t_power_role tpr on t_role.id = tpr.role_id
left join t_power tp on tp.id = tpr.power_id
left join t_menu tm on tp.id = tm.power_id
left join t_element te on tp.id = te.power_id
left join t_operation t on tp.id = t.power_id
where t_role.deleted = 0 and (tpr.deleted = 0 or tpr.deleted is null);
where t_role.deleted = 0
and (tpr.deleted = 0 or tpr.deleted is null);
</select>
<select id="getOneById" resultMap="roleMap">
select t_role.id as role_id,
@@ -57,7 +58,7 @@
left join t_element te on tp.id = te.power_id
left join t_operation t on tp.id = t.power_id
where t_role.deleted = 0
and tpr.deleted = 0
and (tpr.deleted = 0 or tpr.deleted is null)
and t_role.id = #{id};
</select>