timi/TimiServerAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

v1.0.23 #33

Merged
timi merged 5 commits from dev into master 2026-08-22 09:51:37 +00:00
Conversation 0 Commits 5 Files Changed 24
+2 -7
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 376f0ecd05 - Show all commits
src/main/java/com/imyeyu/api/modules/gao/service/implement/GaoUserInviteServiceImplement.java
+2 -7
View File
@@ -276,15 +276,10 @@ public class GaoUserInviteServiceImplement implements GaoUserInviteService {
private Role requireInvitableRole(String inviterUserId, String roleId, String storeId) { private Role requireInvitableRole(String inviterUserId, String roleId, String storeId) {
Role role = requireValidRole(roleId, storeId); Role role = requireValidRole(roleId, storeId);
List<String> directRoleIdList = userRoleService.listRoleByUserId(ModuleCode.GAO, inviterUserId)
.stream()
.map(Role::getId)
.toList();
boolean adminInviteGlobalManager = isCoreAdmin() && isGlobalManagerRole(role); boolean adminInviteGlobalManager = isCoreAdmin() && isGlobalManagerRole(role);
boolean descendant = adminInviteGlobalManager || (authorizationScopeService.listManageableRole(inviterUserId, ModuleCode.GAO) boolean descendant = adminInviteGlobalManager || authorizationScopeService.listManageableRole(inviterUserId, ModuleCode.GAO)
.stream() .stream()
.anyMatch(item -> role.getId().equals(item.getId())) .anyMatch(item -> role.getId().equals(item.getId()));
&& !directRoleIdList.contains(role.getId()));
if (!descendant) { if (!descendant) {
throw new TimiException(TimiCode.PERMISSION_ERROR, "角色不在可邀请范围内"); throw new TimiException(TimiCode.PERMISSION_ERROR, "角色不在可邀请范围内");
} }