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

独联体-单独政策

Browse Source
This commit is contained in:
hokli
2025-09-18 18:17:21 +08:00
parent 1b9e5a6e97
commit 4610632a4d
22 changed files with 71 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,8 @@ public class GuildManageAdminService {
}
PartitionInfo partitionInfo = partitionInfoService.getById(u.getPartitionId());
if (null == partitionInfo || (!Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode())
&& !Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode()))){
&& !Constant.ClanMode.GUILD_POLICY2.equals(partitionInfo.getClanMode())
&& !Constant.ClanMode.SOVIET.equals(partitionInfo.getClanMode()))){
throw new AdminServiceException(BusiStatus.PARTITION_ERROR);
}

3
accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/user/UserCancelAdminService.java
View File

@@ -131,7 +131,8 @@ public class UserCancelAdminService extends BaseService {
familyManageAdminService.removeMember(vaildFamilyMemberByUid.getId(), 0);
}
} else if (Constant.ClanMode.GUILD.equals(partitionEnum.getClanMode())
|| Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())) {
|| Constant.ClanMode.GUILD_POLICY2.equals(partitionEnum.getClanMode())
|| Constant.ClanMode.SOVIET.equals(partitionEnum.getClanMode())) {
GuildMember vaildGuildMemberByUid = guildMemberService.getVaildGuildMemberByUid(users.getUid());
if (vaildGuildMemberByUid != null && GuildConstant.RoleType.OWNER.equals(vaildGuildMemberByUid.getRoleType())) {
Guild validOwnUid = guildManageAdminService.getValidByOwnUid(users.getUid());