src/main/java/org/springblade/modules/system/controller/MenuController.java
@@ -35,6 +35,7 @@ import org.springblade.modules.system.entity.Menu; import org.springblade.modules.system.entity.TopMenu; import org.springblade.modules.system.service.IMenuService; import org.springblade.modules.system.service.IRoleService; import org.springblade.modules.system.service.ITopMenuService; import org.springblade.modules.system.vo.CheckedTreeVO; import org.springblade.modules.system.vo.GrantTreeVO; @@ -63,6 +64,7 @@ private final IMenuService menuService; private final ITopMenuService topMenuService; private final IRoleService roleService; /** * 详情 @@ -241,6 +243,7 @@ vo.setMenu(menuService.roleTreeKeys(roleIds)); vo.setDataScope(menuService.dataScopeTreeKeys(roleIds)); vo.setApiScope(menuService.apiScopeTreeKeys(roleIds)); vo.setSystemIds(roleService.getById(roleIds).getSystemId()); return R.data(vo); } src/main/java/org/springblade/modules/system/controller/RoleController.java
@@ -149,7 +149,10 @@ CacheUtil.clear(SYS_CACHE); CacheUtil.clear(SYS_CACHE, Boolean.FALSE); boolean temp = roleService.grant(grantVO.getRoleIds(), grantVO.getMenuIds(), grantVO.getDataScopeIds(), grantVO.getApiScopeIds()); return R.status(temp); Role role = roleService.getById(grantVO.getRoleIds().get(0)); role.setSystemId(grantVO.getSystemIds()); boolean status = roleService.updateById(role); return R.status(temp&&status); } /** src/main/java/org/springblade/modules/system/entity/Role.java
@@ -86,5 +86,9 @@ @ApiModelProperty(value = "是否已删除") private Integer isDeleted; /** * 系统主键 */ private String systemId; } src/main/java/org/springblade/modules/system/vo/CheckedTreeVO.java
@@ -34,4 +34,6 @@ private List<String> apiScope; private String systemIds; } src/main/java/org/springblade/modules/system/vo/GrantVO.java
@@ -45,5 +45,8 @@ @ApiModelProperty(value = "apiScopeIds集合") private List<Long> apiScopeIds; /** * 系统主键 */ private String systemIds; }