角色分页增加数据权限

hazard-admin/src/main/java/com/ozs/web/controller/system/SysRoleController.java

@@ -82,31 +82,11 @@ public class SysRoleController extends BaseController
     @ApiOperation("根据条件分页查询角色数据")
     public AjaxResult page(@NotEmpty(message = "数据为空")
                            @RequestBody SysRoleRequestVo vo) {
-//        vo= (SysRoleRequestVo) dataScoreUtil.setDataScore(getUserId(),vo);
-        LambdaQueryWrapper<SysRole> lw = new LambdaQueryWrapper<SysRole>();
-        lw.eq(SysRole::getDelFlag, 1);
-        if (!StringUtils.isBlank(vo.getRoleName())) {
-            lw.like(SysRole::getRoleName, "%" +vo.getRoleName() + "%");
-        }
-        if (!ObjectUtils.isEmpty(vo.getRoleId())) {
-            lw.eq(SysRole::getRoleId, vo.getRoleId() );
-        }
-        if (!StringUtils.isBlank(vo.getStatus())) {
-            lw.eq(SysRole::getStatus, vo.getStatus());
-        }
-        
-//        if(!vo.getDsFlay()){
-//            if (!ObjectUtils.isEmpty(vo.getDsUserId())){
-//                lw.eq(SysRole::getCreateBy, vo.getDsUserId()).or();
-//            }
-//            if (!ObjectUtils.isEmpty(vo.getDsDeptId())){
-//                lw.eq(SysRole::getDeptId,vo.getDsDeptId()).or();
-//            }
-//            if (!ObjectUtils.isEmpty(vo.getDsDeptIds())){
-//                lw.in(SysRole::getDeptId,vo.getDsDeptIds());
-//            }
-//        }
-        IPage<SysRole> page = roleService.page(new Page<SysRole>(vo.getPageNum(), vo.getPageSize()), lw);
+        vo= (SysRoleRequestVo) dataScoreUtil.setDataScore(getUserId(),vo);
+        IPage<SysRole> page = roleService.queryPage(vo);
+        page.setTotal(page.getTotal());
+        page.setCurrent(page.getCurrent());
+        page.setPages(page.getPages());
         return success(page);
 
     }

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -104,7 +104,6 @@ public class SysUserController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:user:list')")
     public AjaxResult list(@RequestBody SysUserVo sysUserVo) {
         sysUserVo = (SysUserVo) dataScoreUtil.setDataScore(getUserId(), sysUserVo);
-        LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<SysUser>();
         IPage<SysUser> page = userService.queryPage(sysUserVo);
         page.setTotal(page.getTotal());
         page.setCurrent(page.getCurrent());