From bcb2e2fc606ed4c7eb0888c15187ee8a52d95ee6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 16 May 2019 14:29:26 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]:=E6=BA=90=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/sys/MallRoleController.java | 38 +------------------ 1 file changed, 2 insertions(+), 36 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 6f79ce957..e34889586 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -93,10 +93,10 @@ public class MallRoleController extends BaseController { } sysRole.setTenantId(tenantId); sysRoleService.saveOrUpdate(sysRole); -// SysRolePermissionService.deleteById(id); if (StringUtils.isNoneBlank(sysRole.getMenus())) { + String [] menuIds = sysRole.getMenus().split(","); List mIds = new ArrayList<>(); - for (String mId : sysRole.getMenus().split(",")) { + for (String mId : menuIds) { mIds.add(Long.valueOf(mId)); } sysRolePermissionService.savePermissions(tenantId, sysRole.getId(), mIds.toArray(new Long[]{})); @@ -104,40 +104,6 @@ public class MallRoleController extends BaseController { 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("角色删除") @PostMapping("/del") //@RequiresPermissions("sys:role:del")