From 68d0641f2e3d913bc7104e942664b652aa08debb Mon Sep 17 00:00:00 2001
From: lilong <lilong@axzo.cn>
Date: Sun, 29 Sep 2024 13:53:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:(REQ-3034)=20=E6=94=AF=E6=8C=81=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E8=A7=92=E8=89=B2code=EF=BC=8C=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roleuser/dto/SaasRoleUserRelationDTO.java |  8 ++++++++
 .../mapper/SaasRoleUserRelationMapper.xml     | 20 +++++++++++--------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SaasRoleUserRelationDTO.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SaasRoleUserRelationDTO.java
index 7297598a..b4b69369 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SaasRoleUserRelationDTO.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/dto/SaasRoleUserRelationDTO.java
@@ -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;
 }
diff --git a/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml b/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml
index f1f8b2d5..552dc334 100644
--- a/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml
+++ b/tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml
@@ -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>