| @@ -93,10 +93,10 @@ public class MallRoleController extends BaseController { | |||||
| } | } | ||||
| sysRole.setTenantId(tenantId); | sysRole.setTenantId(tenantId); | ||||
| sysRoleService.saveOrUpdate(sysRole); | sysRoleService.saveOrUpdate(sysRole); | ||||
| // SysRolePermissionService.deleteById(id); | |||||
| if (StringUtils.isNoneBlank(sysRole.getMenus())) { | if (StringUtils.isNoneBlank(sysRole.getMenus())) { | ||||
| String [] menuIds = sysRole.getMenus().split(","); | |||||
| List<Long> mIds = new ArrayList<>(); | List<Long> mIds = new ArrayList<>(); | ||||
| for (String mId : sysRole.getMenus().split(",")) { | |||||
| for (String mId : menuIds) { | |||||
| mIds.add(Long.valueOf(mId)); | mIds.add(Long.valueOf(mId)); | ||||
| } | } | ||||
| sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{})); | sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{})); | ||||
| @@ -104,40 +104,6 @@ public class MallRoleController extends BaseController { | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @ApiOperation("角色增加") | |||||
| @PostMapping("add") | |||||
| //@RequiresPermissions("sys:role:add") | |||||
| @SystemControllerLog(description = "用户管理-rule添加") | |||||
| public ResultData add(MallRole sysRole) { | |||||
| logger.debug("[" + getIpAddr() + "] MallRoleController::add"); | |||||
| MallUserInfo currentUser = getUser(); | |||||
| if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { | |||||
| return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能添加角色"); | |||||
| } | |||||
| Assert.notNull(sysRole.getName(), "角色名不能为空"); | |||||
| Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>0, "重复的角色名"); | |||||
| sysRoleService.saveOrUpdate(sysRole); | |||||
| return new ResultData(); | |||||
| } | |||||
| @ApiOperation("角色更新") | |||||
| @PostMapping("update") | |||||
| //@RequiresPermissions("sys:role:update") | |||||
| @SystemControllerLog(description = "用户管理-rule更新") | |||||
| public ResultData update(MallRole sysRole) { | |||||
| logger.debug("[" + getIpAddr() + "] MallRoleController::update"); | |||||
| MallUserInfo currentUser = getUser(); | |||||
| if(currentUser.getIsAdmin().equals(EnumUserAdmin.Normal.getCode())) { | |||||
| return new ResultData(ErrorCode.USER_NOT_ADMIN.getCode(), "只有系统管理员才能更新角色"); | |||||
| } | |||||
| if (sysRole.getName() != null) { | |||||
| Assert.isTrue(checkUnique(sysRole.getName(), currentUser.getTenantId())>1, "角色名已存在"); | |||||
| } | |||||
| sysRoleService.saveOrUpdate(sysRole); | |||||
| // Assert.notNull(sysRole.getName(), "角色名不能为空"); | |||||
| return new ResultData(); | |||||
| } | |||||
| @ApiOperation("角色删除") | @ApiOperation("角色删除") | ||||
| @PostMapping("/del") | @PostMapping("/del") | ||||
| //@RequiresPermissions("sys:role:del") | //@RequiresPermissions("sys:role:del") | ||||