【8.3.3】【role】角色列表查询，增加角色分类的查询条件

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/SysRoleRequest.java

@@ -88,4 +88,10 @@ public class SysRoleRequest extends BaseRequest {
     @ChineseDescription("角色id集合，用在批量删除")
     private Set<Long> roleIdList;
 
+    /**
+     * 角色分类id
+     */
+    @ChineseDescription("角色分类id")
+    private Long roleCategoryId;
+
 }

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/SysRoleServiceImpl.java

@@ -454,6 +454,11 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
             queryWrapper.nested(i -> i.like(SysRole::getRoleName, searchText).or().like(SysRole::getRoleCode, searchText));
         }
 
+        // 根据角色分类id查询角色
+        if (ObjectUtil.isNotEmpty(sysRoleRequest.getRoleCategoryId())) {
+            queryWrapper.eq(SysRole::getRoleCategoryId, sysRoleRequest.getRoleCategoryId());
+        }
+
         // 排序字段
         queryWrapper.orderByAsc(SysRole::getRoleType);
         queryWrapper.orderByAsc(SysRole::getRoleSort);