From 1b8fd5809f6265eaf7a439bfad3f3b11e272620d Mon Sep 17 00:00:00 2001 From: hokli <2629910752@qq.com> Date: Thu, 18 Sep 2025 18:27:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8B=AC=E8=81=94=E4=BD=93-=E5=8D=95=E7=8B=AC?= =?UTF-8?q?=E6=94=BF=E7=AD=96fixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/GuildMemberWeekLevelRewardRecordAdminService.java | 3 ++- .../accompany/business/service/family/FamilyClanService.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java index 429c74c15..b0675720f 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/GuildMemberWeekLevelRewardRecordAdminService.java @@ -55,7 +55,8 @@ public class GuildMemberWeekLevelRewardRecordAdminService { PartitionInfo partitionInfo = partitionInfoService.getById(partitionId); 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.PARAMERROR); } else if (!StringUtils.hasText(cycleDate)) { throw new AdminServiceException(BusiStatus.PARAMERROR); diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java index 7a95d7f80..e78629bd9 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java @@ -51,7 +51,8 @@ public class FamilyClanService { } FamilyClanDecorateVo vo = new FamilyClanDecorateVo(); vo.setClanMode(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())? Constant.ClanMode.FAMILY: partitionInfo.getClanMode()); if (Constant.ClanMode.CLAN_HALL.equals(partitionInfo.getClanMode())) {