feat: (feature/REQ-2595) 临时接口增加roleName返回

tyr-api/src/main/java/cn/axzo/tyr/client/model/roleuser/req/PageRoleUserRelationReq.java

@@ -34,6 +34,8 @@ public class PageRoleUserRelationReq{
 
     private Boolean includeDelete;
 
-    @NotEmpty(message = "roleIds不能为空")
+//    @NotEmpty(message = "roleIds不能为空")
     private Set<Long> roleIds;
+
+    private Set<Long> personIds;
 }

tyr-server/src/main/java/cn/axzo/tyr/server/controller/roleuser/RoleUserController.java

@@ -348,7 +348,12 @@ public class RoleUserController implements TyrSaasRoleUserApi {
         }
 
         return saasRoleUserRelationService.listV2(ListRoleUserRelationParam.builder()
-                .roleIds(Lists.newArrayList(param.getRoleIds()))
+                        .roleIds(Optional.ofNullable(param.getRoleIds())
+                                .map(Lists::newArrayList)
+                                .orElse(null))
+                        .personIds(Optional.ofNullable(param.getPersonIds())
+                                .map(Lists::newArrayList)
+                                .orElse(null))
                         .workspaceOuPairs(Optional.ofNullable(param.getWorkspaceOUPairs())
                                 .map(e -> e.stream().map(f -> ListRoleUserRelationParam.WorkspaceOuPair.builder()
                                                 .workspaceId(f.getWorkspaceId())

tyr-server/src/main/resources/mapper/SaasRoleUserRelationMapper.xml

@@ -61,6 +61,13 @@
                 </foreach>
             </if>
 
+            <if test="param.personIds != null and param.personIds.size()>0">
+                AND t1.natural_person_id IN
+                <foreach collection="param.personIds" open="(" close=")" separator="," index="index" item="item">
+                    #{item}
+                </foreach>
+            </if>
+
         </where>
     </select>