moliparty/peko-java
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去掉公会改邀请人限制fixed

Browse Source
This commit is contained in:
hokli
2025-06-19 11:25:51 +08:00
parent 4bb9a351b4
commit ef5aec810c
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/family/FamilyManageAdminService.java
View File

@@ -213,10 +213,10 @@ public class FamilyManageAdminService {
Optional.ofNullable(inviteUid)
.filter(x -> !Objects.equals(family.getInviteUid(), x))
.ifPresent(x -> {
// Optional.ofNullable(bdInfoAdminService.existBdBoundGuildId(family.getId()))
// .ifPresent(bdGuild -> {
// throw new AdminServiceException("公会已经通过邀请人绑定BD，如需更改邀请人，请移步BD管理解除BD绑定");
// });
Optional.ofNullable(bdInfoAdminService.existBdBoundGuildId(family.getId()))
.ifPresent(bdGuild -> {
throw new AdminServiceException("公会已经通过邀请人绑定BD，如需更改邀请人，请移步BD管理解除BD绑定");
});
bdInfoAdminService.bindBdFamily(family, x);
});
}

11
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildManageAdminService.java
View File

@@ -193,9 +193,6 @@ public class GuildManageAdminService {
throw new AdminServiceException(GUILD_APPLY_GUILD_NAME_CHECK);
}
//后天添加了公会超管，绑定之后不允许更改邀请人
this.guildSuperAdminCheck(guild, inviteErbanNo);
Long inviteUid = this.bdBound(guild, inviteErbanNo);
guildService.lambdaUpdate().eq(Guild::getId, id)
@@ -257,10 +254,10 @@ public class GuildManageAdminService {
Optional.ofNullable(inviteUid)
.filter(x -> !Objects.equals(guild.getInviteUid(), x))
.ifPresent(x -> {
// Optional.ofNullable(bdInfoAdminService.existBdBoundGuildId(guild.getId()))
// .ifPresent(bdGuild -> {
// throw new AdminServiceException("公会已经通过邀请人绑定BD，如需更改邀请人，请移步BD管理解除BD绑定");
// });
Optional.ofNullable(bdInfoAdminService.existBdBoundGuildId(guild.getId()))
.ifPresent(bdGuild -> {
throw new AdminServiceException("公会已经通过邀请人绑定BD，如需更改邀请人，请移步BD管理解除BD绑定");
});
bdInfoAdminService.bindBdGuild(guild, x);
});
}