This commit is contained in:
xiangwbs
2018-04-21 23:43:52 +08:00
parent 42e0d55246
commit 8d591ac9ed
6 changed files with 633 additions and 13 deletions
@@ -123,7 +123,7 @@ public class SysRoleControl {
if (sysRole == null) {
return JsonResult.toJSONObj("该角色不存在");
}
String ids[] = authorityIds.split(",");
String[] ids = authorityIds.split(",");
List<SysRoleAuthority> list = new ArrayList<>();
SysRoleAuthority roleAuthority;
for (String id : ids) {
@@ -167,13 +167,13 @@ public class SysUserControl {
list = sysUserService.listAuthorityByIdAndEnable(sysUser.getId(), CommonEnum.YesOrNoEnum.YES.getCode());
}
if (CollectionUtils.isNotEmpty(list)) {
for (SysAuthority sysAuthority : list) {
list.forEach(sysAuthority -> {
if (sysAuthority.getType() == CommonEnum.MenuOrButtonEnum.MENU.getCode()) {
menu.add(sysAuthority);
} else {
button.add(sysAuthority);
}
}
});
}
sysUser.setMenus(menu);
sysUser.setButtons(button);
@@ -197,7 +197,7 @@ public class SysUserControl {
if (CommonEnum.YesOrNoEnum.YES.getCode().equalsIgnoreCase(old.getAdmin())) {
return JsonResult.toJSONObj("不能对管理员进行操作");
}
String ids[] = roleIds.split(",");
String[] ids = roleIds.split(",");
List<SysUserRole> list = new ArrayList<>();
SysUserRole userRole;
for (String id : ids) {