| | |
|---|
| | | UserEntity userlogin = LoginUserUtil.getLoginUser(); |
|---|
| | | Page<AdminRoleVo> page = new Page<>(adminRoleDto.getPageNum(), adminRoleDto.getPageSize()); |
|---|
| | | RoleEntity roleEntity = new RoleEntity(); |
|---|
| | | Long belongId = userlogin.getBelongId() == null ? 0L : userlogin.getBelongId(); |
|---|
| | | Long companyId = userlogin.getCompanyId() == null ? UserEntity.USER_BELONG_TOP : userlogin.getCompanyId(); |
|---|
| | | if(StrUtil.isNotEmpty(adminRoleDto.getRoleName())){ |
|---|
| | | roleEntity.setRoleName(adminRoleDto.getRoleName()); |
|---|
| | | } |
|---|
| | | if(belongId > 0L){ |
|---|
| | | roleEntity.setBelongId(belongId); |
|---|
| | | if(companyId > UserEntity.USER_BELONG_TOP){ |
|---|
| | | roleEntity.setCompanyId(companyId); |
|---|
| | | } |
|---|
| | | IPage<AdminRoleVo> list = this.baseMapper.selectAdminRoleVoInPage(page,roleEntity); |
|---|
| | | return Result.ok(list); |
|---|
| | |
|---|
| | | public Result addRole(AdminAddRoleDto adminAddRoleDto) { |
|---|
| | | UserEntity userlogin = LoginUserUtil.getLoginUser(); |
|---|
| | | String roleName = adminAddRoleDto.getRoleName(); |
|---|
| | | if(StrUtil.isEmpty(roleName)){ |
|---|
| | | return Result.fail("请输入角色名称"); |
|---|
| | | } |
|---|
| | | String menuIds = adminAddRoleDto.getMenuIds(); |
|---|
| | | if(StrUtil.isEmpty(menuIds)){ |
|---|
| | | return Result.fail("请选择角色权限"); |
|---|
| | | } |
|---|
| | | RoleEntity roleEntity = new RoleEntity(); |
|---|
| | | String remark = adminAddRoleDto.getRemark(); |
|---|
| | | if(StrUtil.isNotEmpty(remark)){ |
|---|
| | | roleEntity.setRemark(remark); |
|---|
| | | } |
|---|
| | | roleEntity.setRoleName(roleName); |
|---|
| | | roleEntity.setBelongId(userlogin.getBelongId() == null?0L:userlogin.getBelongId()); |
|---|
| | | roleEntity.setCompanyId(userlogin.getCompanyId() == null?UserEntity.USER_BELONG_TOP:userlogin.getCompanyId()); |
|---|
| | | int insert = this.baseMapper.insert(roleEntity); |
|---|
| | | if(insert > 0){ |
|---|
| | | saveRoleMenus(menuIds,roleEntity.getId()); |
|---|
| | |
|---|
| | | String[] roleIds = ids.split(StringPool.COMMA); |
|---|
| | | for(String roleIdStr : roleIds){ |
|---|
| | | Long roleId = Long.valueOf(roleIdStr); |
|---|
| | | |
|---|
| | | RoleEntity roleEntity = this.baseMapper.selectById(roleId); |
|---|
| | | if(RoleEntity.ROLE_ADMIN_NAME.equals(roleEntity.getRoleName()) |
|---|
| | | || RoleEntity.ROLE_SUPER_NAME.equals(roleEntity.getRoleName())){ |
|---|
| | | return Result.fail(RoleEntity.ROLE_ADMIN_NAME + RoleEntity.ROLE_SUPER_NAME +"角色无法删除"); |
|---|
| | | } |
|---|
| | | QueryWrapper<UserRoleEntity> objectQueryWrapper = new QueryWrapper<>(); |
|---|
| | | objectQueryWrapper.eq("role_id",roleId); |
|---|
| | | userRoleMapper.delete(objectQueryWrapper); |
|---|
