【8.3.3】【role】初始化：获取角色的数据范围列表

kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/controller/RoleDataScopeController.java

@@ -0,0 +1,44 @@
+package cn.stylefeng.roses.kernel.sys.modular.role.controller;
+
+import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
+import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
+import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
+import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.ApiResource;
+import cn.stylefeng.roses.kernel.scanner.api.annotation.GetResource;
+import cn.stylefeng.roses.kernel.sys.api.constants.PermissionCodeConstants;
+import cn.stylefeng.roses.kernel.sys.modular.role.entity.SysRoleDataScope;
+import cn.stylefeng.roses.kernel.sys.modular.role.pojo.request.SysRoleDataScopeRequest;
+import cn.stylefeng.roses.kernel.sys.modular.role.service.SysRoleDataScopeService;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 角色数据范围配置
+ *
+ * @author fengshuonan
+ * @since 2025/1/24 18:12
+ */
+@RestController
+@ApiResource(name = "角色数据范围配置")
+public class RoleDataScopeController {
+
+    @Resource
+    private SysRoleDataScopeService sysRoleDataScopeService;
+
+    /**
+     * 获取角色的数据范围列表
+     *
+     * @author fengshuonan
+     * @since 2025/1/24 18:12
+     */
+    @GetResource(name = "获取角色的数据范围列表", path = "/roleDataScope/getRoleDataScopePageList", requiredPermission = true,
+            requirePermissionCode = PermissionCodeConstants.CHANGE_ROLE_DATA_SCOPE)
+    public ResponseData<PageResult<SysRoleDataScope>> getRoleDataScopePageList(
+            @Validated(BaseRequest.page.class) SysRoleDataScopeRequest roleDataScopeRequest) {
+        PageResult<SysRoleDataScope> pageList = sysRoleDataScopeService.findPage(roleDataScopeRequest);
+        return new SuccessResponseData<>(pageList);
+    }
+
+}

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

@@ -19,21 +19,19 @@ public class SysRoleDataScopeRequest extends BaseRequest {
     /**
      * 主键
      */
-    @NotNull(message = "主键不能为空", groups = {edit.class, delete.class})
     @ChineseDescription("主键")
     private Long roleDataScopeId;
 
     /**
      * 角色id
      */
-    @NotNull(message = "角色id不能为空", groups = {add.class, edit.class})
+    @NotNull(message = "角色id不能为空", groups = {page.class})
     @ChineseDescription("角色id")
     private Long roleId;
 
     /**
      * 机构id
      */
-    @NotNull(message = "机构id不能为空", groups = {add.class, edit.class})
     @ChineseDescription("机构id")
     private Long organizationId;
 

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

@@ -54,16 +54,6 @@ public interface SysRoleDataScopeService extends IService<SysRoleDataScope> {
      */
     SysRoleDataScope detail(SysRoleDataScopeRequest sysRoleDataScopeRequest);
 
-    /**
-     * 获取列表
-     *
-     * @param sysRoleDataScopeRequest 请求参数
-     * @return List<SysRoleDataScope>   返回结果
-     * @author fengshuonan
-     * @date 2023/06/10 21:29
-     */
-    List<SysRoleDataScope> findList(SysRoleDataScopeRequest sysRoleDataScopeRequest);
-
     /**
      * 获取列表（带分页）
      *

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

@@ -77,12 +77,6 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
         return PageResultFactory.createPageResult(sysRolePage);
     }
 
-    @Override
-    public List<SysRoleDataScope> findList(SysRoleDataScopeRequest sysRoleDataScopeRequest) {
-        LambdaQueryWrapper<SysRoleDataScope> wrapper = this.createWrapper(sysRoleDataScopeRequest);
-        return this.list(wrapper);
-    }
-
     @Override
     public RoleBindDataScopeResponse getRoleBindDataScope(RoleBindDataScopeRequest roleBindDataScopeRequest) {
 
@@ -195,6 +189,7 @@ public class SysRoleDataScopeServiceImpl extends ServiceImpl<SysRoleDataScopeMap
     private LambdaQueryWrapper<SysRoleDataScope> createWrapper(SysRoleDataScopeRequest sysRoleDataScopeRequest) {
         LambdaQueryWrapper<SysRoleDataScope> queryWrapper = new LambdaQueryWrapper<>();
 
+        // 根据角色id进行查询
         Long roleId = sysRoleDataScopeRequest.getRoleId();
         queryWrapper.eq(ObjectUtil.isNotNull(roleId), SysRoleDataScope::getRoleId, roleId);