public/MaxKey
1
0
Fork 0
mirror of https://gitee.com/dromara/MaxKey.git synced 2026-05-15 04:52:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

dynamic Groups and Roles

Browse Source
This commit is contained in:
MaxKey
2022-04-27 15:23:36 +08:00
parent 6523b2b12e
commit b1b021e63f
13 changed files with 68 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/GroupMemberMapper.java
View File

@@ -34,7 +34,6 @@ import org.maxkey.entity.UserInfo;
public interface GroupMemberMapper extends IJpaBaseMapper<GroupMember> {
public List<GroupMember> allMemberInGroup(GroupMember entity);
public List<GroupMember> memberInGroup(GroupMember entity);
public List<GroupMember> memberNotInGroup(GroupMember entity);
public List<GroupMember> groupMemberInGroup(GroupMember entity);

1
maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/RoleMemberMapper.java
View File

@@ -33,7 +33,6 @@ import org.maxkey.entity.Roles;
public interface RoleMemberMapper extends IJpaBaseMapper<RoleMember> {
public List<RoleMember> allMemberInRole(RoleMember entity);
public List<RoleMember> memberInRole(RoleMember entity);
public List<RoleMember> memberNotInRole(RoleMember entity);
public List<RoleMember> roleMemberInRole(RoleMember entity);

53
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml
View File

@@ -11,51 +11,12 @@
</if>
</sql>
<!-- GROUP_MEMBER User Member-->
<select id="allMemberInGroup" parameterType="GroupMember" resultType="GroupMember">
select distinct
u.id,
u.username,
u.usertype,
u.windowsaccount,
u.displayname ,
u.nickname ,
u.namezhspell,
u.namezhshortspell,
u.givenname ,
u.middlename ,
u.familyname ,
u.gender,
u.authntype,
u.mobile,
u.email,
u.workemail,
u.workphonenumber,
u.employeenumber,
u.division,
u.costcenter,
u.organization,
u.departmentid,
u.department,
u.jobtitle,
u.joblevel,
u.createddate,
u.status
from
mxk_userinfo u
where instid = #{instId}
</select>
<select id="memberInGroup" parameterType="GroupMember" resultType="GroupMember">
select distinct
gm.id,
gm.id as id,
g.id as groupid,
g.name as groupname,
g.dynamic dynamic,
u.username,
u.usertype,
u.windowsaccount,
@@ -210,7 +171,7 @@
instid
)
select
concat('${id}',u.id) id,
concat('${id}_',u.id) id,
'${id}' groupid,
u.id memberid,
'USER-DYNAMIC' type,
@@ -250,6 +211,8 @@
<select id="queryMemberByGroupId" parameterType="string" resultType="UserInfo">
select distinct
g.groupId,
g.groupName,
u.id,
u.username,
u.usertype,
@@ -296,7 +259,7 @@
<delete id="deleteByGroupId" parameterType="string" >
delete from mxk_group_member gm
where gm.groupid=#{value}
where gm.groupid = #{value} and groupId != 'ROLE_ALL_USER'
</delete>
</mapper>

51
maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml
View File

@@ -10,52 +10,13 @@
and name = #{name}
</if>
</sql>
<!-- ROLE_MEMBER User Member-->
<select id="allMemberInRole" parameterType="RoleMember" resultType="RoleMember">
select distinct
u.id,
u.username,
u.usertype,
u.windowsaccount,
u.displayname ,
u.nickname ,
u.namezhspell,
u.namezhshortspell,
u.givenname ,
u.middlename ,
u.familyname ,
u.gender,
u.authntype,
u.mobile,
u.email,
u.workemail,
u.workphonenumber,
u.employeenumber,
u.division,
u.costcenter,
u.organization,
u.departmentid,
u.department,
u.jobtitle,
u.joblevel,
u.createddate,
u.status
from
mxk_userinfo u
where instid = #{instId}
</select>
<select id="memberInRole" parameterType="RoleMember" resultType="RoleMember">
select distinct
rm.id,
r.id as roleid,
r.name as rolename,
r.dynamic dynamic,
rm.id as id,
u.username,
u.usertype,
u.windowsaccount,
@@ -211,7 +172,7 @@
type
)
select
concat('${id}',u.id) id,
concat('${id}_',u.id) id,
'${id}' ROLEID,
u.id memberid,
'USER-DYNAMIC' type