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-09-18 18:27:07 +08:00
parent 4610632a4d
commit 1b8fd5809f
2 changed files with 4 additions and 2 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/GuildMemberWeekLevelRewardRecordAdminService.java
View File

@@ -55,7 +55,8 @@ public class GuildMemberWeekLevelRewardRecordAdminService {
PartitionInfo partitionInfo = partitionInfoService.getById(partitionId); PartitionInfo partitionInfo = partitionInfoService.getById(partitionId);
if (null == partitionInfo if (null == partitionInfo
|| (!Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) || (!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); throw new AdminServiceException(BusiStatus.PARAMERROR);
} else if (!StringUtils.hasText(cycleDate)) { } else if (!StringUtils.hasText(cycleDate)) {
throw new AdminServiceException(BusiStatus.PARAMERROR); throw new AdminServiceException(BusiStatus.PARAMERROR);

3
accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/family/FamilyClanService.java
View File

@@ -51,7 +51,8 @@ public class FamilyClanService {
} }
FamilyClanDecorateVo vo = new FamilyClanDecorateVo(); FamilyClanDecorateVo vo = new FamilyClanDecorateVo();
vo.setClanMode(Constant.ClanMode.GUILD.equals(partitionInfo.getClanMode()) 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()); Constant.ClanMode.FAMILY: partitionInfo.getClanMode());
if (Constant.ClanMode.CLAN_HALL.equals(partitionInfo.getClanMode())) { if (Constant.ClanMode.CLAN_HALL.equals(partitionInfo.getClanMode())) {