wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:(REQ-3034) 支持返回角色code，角色类型

Browse Source
This commit is contained in:
lilong 2024-09-29 13:53:48 +08:00
parent 3eecfbc372
commit 68d0641f2e
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SaasRoleUserRelationDTO.java
View File

@ -70,4 +70,12 @@ public class SaasRoleUserRelationDTO {
private Date updateAt;
private Long isDelete;
/**
* 角色类型：
* cn.axzo.tyr.client.common.enums.RoleTypeEnum
*/
private String roleType;
private String roleCode;
}

20
tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml
View File

@ -33,8 +33,12 @@
</select>
<select id="pageRoleUserRelation" resultType="cn.axzo.tyr.client.model.roleuser.dto.SaasRoleUserRelationDTO">
SELECT *
FROM saas_role_user_relation
SELECT t1.*,t2.role_code,t2.role_type
FROM
saas_role_user_relation t1
left join
saas_role t2
on t1.role_id = t2.id
<where>
<if test="param.workspaceOuPairs != null and param.workspaceOuPairs.size()>0">
(
@ -42,29 +46,29 @@
separator=") or ( ">
1=1
<if test="ouIdAndWorkspaceId.workspaceId !=null">
and workspace_id = #{ouIdAndWorkspaceId.workspaceId}
and t1.workspace_id = #{ouIdAndWorkspaceId.workspaceId}
</if>
<if test="ouIdAndWorkspaceId.ouId !=null">
and ou_id = #{ouIdAndWorkspaceId.ouId}
and t1.ou_id = #{ouIdAndWorkspaceId.ouId}
</if>
</foreach>
)
</if>
<if test="param.includeDelete != null and param.includeDelete == true">
AND is_delete <![CDATA[ >= ]]> 0
AND t1.is_delete <![CDATA[ >= ]]> 0
</if>
<if test="param.includeDelete == null or param.includeDelete == false">
AND is_delete = 0
AND t1.is_delete = 0
</if>
<if test="param.updateAtLE != null">
AND update_at <![CDATA[ <= ]]> #{param.updateAtLE}
AND t1.update_at <![CDATA[ <= ]]> #{param.updateAtLE}
</if>
<if test="param.updateAtGE != null">
AND update_at <![CDATA[ >= ]]> #{param.updateAtGE}
AND t1.update_at <![CDATA[ >= ]]> #{param.updateAtGE}
</if>
</where>
</select>