add sales order
This commit is contained in:
@@ -49,10 +49,10 @@ public class RoleController {
|
||||
@RequireCorePermission(CorePermissionCode.ROLE_READ)
|
||||
@PostMapping("/list")
|
||||
public PageResult<Role> list(@RequestBody Page<Role> page) {
|
||||
Set<String> manageableRoleIdSet = listManageableRoleId();
|
||||
Set<String> visibleRoleIdSet = listVisibleRoleId();
|
||||
PageResult<Role> result = service.page(page);
|
||||
if (result.getList() != null) {
|
||||
result.setList(result.getList().stream().filter(role -> manageableRoleIdSet.contains(role.getId())).toList());
|
||||
result.setList(result.getList().stream().filter(role -> visibleRoleIdSet.contains(role.getId())).toList());
|
||||
result.getList().forEach(this::fillRoleDetail);
|
||||
}
|
||||
return result;
|
||||
@@ -83,7 +83,7 @@ public class RoleController {
|
||||
@PostMapping("/detail")
|
||||
public Role detail(@RequestParam String id) {
|
||||
Role role = service.get(id);
|
||||
requireManageableRole(role.getId());
|
||||
requireVisibleRole(role.getId());
|
||||
fillRoleDetail(role);
|
||||
return role;
|
||||
}
|
||||
@@ -105,7 +105,7 @@ public class RoleController {
|
||||
@RequireCorePermission(CorePermissionCode.ROLE_PERMISSION_READ)
|
||||
@PostMapping("/permission/grantable/list")
|
||||
public List<Permission> listGrantableRolePermission(@RequestParam String roleId) {
|
||||
requireManageableRole(roleId);
|
||||
requireVisibleRole(roleId);
|
||||
return service.listGrantableRolePermission(roleId);
|
||||
}
|
||||
|
||||
@@ -137,6 +137,12 @@ public class RoleController {
|
||||
return service.listGrantableParentRole(roleId);
|
||||
}
|
||||
|
||||
@RequireCorePermission(CorePermissionCode.ROLE_CREATE)
|
||||
@PostMapping("/parent/create/grantable/list")
|
||||
public List<Role> listCreateGrantableParentRole(@RequestParam ModuleCode moduleCode) {
|
||||
return service.listCreateGrantableParentRole(moduleCode);
|
||||
}
|
||||
|
||||
@AOPLog
|
||||
@RequireCorePermission(CorePermissionCode.ROLE_UPDATE)
|
||||
@PostMapping("/parent/update")
|
||||
@@ -197,6 +203,19 @@ public class RoleController {
|
||||
.collect(Collectors.toSet());
|
||||
}
|
||||
|
||||
private Set<String> listVisibleRoleId() {
|
||||
Set<String> roleIdSet = listManageableRoleId();
|
||||
String loginUserId = userLoginService.getRequireLoginUserId();
|
||||
roleIdSet.addAll(userRoleService.listRoleByUserId(loginUserId).stream().map(Role::getId).toList());
|
||||
return roleIdSet;
|
||||
}
|
||||
|
||||
private void requireVisibleRole(String roleId) {
|
||||
if (!listVisibleRoleId().contains(roleId)) {
|
||||
throw new TimiException(TimiCode.PERMISSION_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
private void requireManageableRole(String roleId) {
|
||||
if (!listManageableRoleId().contains(roleId)) {
|
||||
throw new TimiException(TimiCode.PERMISSION_ERROR);
|
||||
|
||||
Reference in New Issue
Block a user