删除部分数据权限

psdc-common/src/main/java/com/psdc/core/domain/entity/SysRole.java

@@ -35,10 +35,6 @@ public class SysRole extends BaseEntity
     @Excel(name = "角色排序")
     private Integer roleSort;
 
-    /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
-    @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
-    private String dataScope;
-
 
     /** 角色状态（0正常 1停用） */
     @Excel(name = "角色状态", readConverterExp = "0=正常,1=停用")
@@ -53,8 +49,6 @@ public class SysRole extends BaseEntity
     /** 菜单组 */
     private Long[] menuIds;
 
-    /** 部门组（数据权限） */
-    private Long[] deptIds;
 
     /** 角色菜单权限 */
     private Set<String> permissions;
@@ -124,16 +118,6 @@ public class SysRole extends BaseEntity
         this.roleSort = roleSort;
     }
 
-    public String getDataScope()
-    {
-        return dataScope;
-    }
-
-    public void setDataScope(String dataScope)
-    {
-        this.dataScope = dataScope;
-    }
-
     public String getStatus()
     {
         return status;
@@ -174,15 +158,6 @@ public class SysRole extends BaseEntity
         this.menuIds = menuIds;
     }
 
-    public Long[] getDeptIds()
-    {
-        return deptIds;
-    }
-
-    public void setDeptIds(Long[] deptIds)
-    {
-        this.deptIds = deptIds;
-    }
 
     public Set<String> getPermissions()
     {
@@ -201,7 +176,6 @@ public class SysRole extends BaseEntity
             .append("roleName", getRoleName())
             .append("roleKey", getRoleKey())
             .append("roleSort", getRoleSort())
-            .append("dataScope", getDataScope())
             .append("status", getStatus())
             .append("delFlag", getDelFlag())
             .append("createBy", getCreateBy())

psdc-system/src/main/java/com/psdc/service/ISysRoleService.java

@@ -82,12 +82,6 @@ public interface ISysRoleService
      */
     public void checkRoleAllowed(SysRole role);
 
-    /**
-     * 校验角色是否有数据权限
-     * 
-     * @param roleId 角色id
-     */
-    public void checkRoleDataScope(Long roleId);
 
     /**
      * 通过角色ID查询角色使用数量

psdc-system/src/main/java/com/psdc/service/impl/SysRoleServiceImpl.java

@@ -166,22 +166,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
         }
     }
 
-    /**
-     * 校验角色是否有数据权限
-     *
-     * @param roleId 角色id
-     */
-    @Override
-    public void checkRoleDataScope(Long roleId) {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
-            SysRole role = new SysRole();
-            role.setRoleId(roleId);
-            List<SysRole> roles = SpringUtils.getAopProxy(this).selectRoleList(role);
-            if (StringUtils.isEmpty(roles)) {
-                throw new ServiceException("没有权限访问角色数据！");
-            }
-        }
-    }
 
     /**
      * 通过角色ID查询角色使用数量
@@ -295,7 +279,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
     public int deleteRoleByIds(Long[] roleIds) {
         for (Long roleId : roleIds) {
             checkRoleAllowed(new SysRole(roleId));
-            checkRoleDataScope(roleId);
             SysRole role = selectRoleById(roleId);
             if (countUserRoleByRoleId(roleId) > 0) {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", role.getRoleName()));

psdc-web/src/main/java/com/psdc/controller/system/SysRoleController.java

@@ -73,7 +73,6 @@ public class SysRoleController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:query')")
     @GetMapping(value = "/{roleId}")
     public AjaxResult getInfo(@PathVariable Long roleId) {
-        roleService.checkRoleDataScope(roleId);
         return success(roleService.selectRoleById(roleId));
     }
 
@@ -102,7 +101,6 @@ public class SysRoleController extends BaseController {
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
         if (!roleService.checkRoleNameUnique(role)) {
             return error("修改角色'" + role.getRoleName() + "'失败，角色名称已存在");
         } else if (!roleService.checkRoleKeyUnique(role)) {
@@ -123,18 +121,6 @@ public class SysRoleController extends BaseController {
         return error("修改角色'" + role.getRoleName() + "'失败，请联系管理员");
     }
 
-    /**
-     * 修改保存数据权限
-     */
-    @PreAuthorize("@ss.hasPermi('system:role:edit')")
-    @Log(title = "角色管理", businessType = BusinessType.UPDATE)
-    @PutMapping("/dataScope")
-    public AjaxResult dataScope(@RequestBody SysRole role) {
-        roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
-        return toAjax(roleService.authDataScope(role));
-    }
-
     /**
      * 状态修改
      */
@@ -143,7 +129,6 @@ public class SysRoleController extends BaseController {
     @PutMapping("/changeStatus")
     public AjaxResult changeStatus(@RequestBody SysRole role) {
         roleService.checkRoleAllowed(role);
-        roleService.checkRoleDataScope(role.getRoleId());
         role.setUpdateBy(getUsername());
         return toAjax(roleService.updateRoleStatus(role));
     }
@@ -216,7 +201,6 @@ public class SysRoleController extends BaseController {
     @Log(title = "角色管理", businessType = BusinessType.GRANT)
     @PutMapping("/authUser/selectAll")
     public AjaxResult selectAuthUserAll(Long roleId, Long[] userIds) {
-        roleService.checkRoleDataScope(roleId);
         return toAjax(roleService.insertAuthUsers(roleId, userIds));
     }