diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildSettleRecordAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildSettleRecordAdminService.java index 21d4be3f4..b3ddb3378 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildSettleRecordAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/guild/GuildSettleRecordAdminService.java @@ -6,7 +6,10 @@ import com.accompany.business.model.guild.Guild; import com.accompany.business.model.guild.GuildMember; import com.accompany.business.model.guild.GuildSettleRecord; import com.accompany.business.param.BasePageParams; -import com.accompany.business.service.guild.*; +import com.accompany.business.service.guild.GuildMemberService; +import com.accompany.business.service.guild.GuildService; +import com.accompany.business.service.guild.GuildSettleRecordService; +import com.accompany.business.service.guild.GuildSettleService; import com.accompany.business.service.user.UsersService; import com.accompany.business.util.FullMonthCycleTimeUtil; import com.accompany.common.status.BusiStatus; @@ -83,7 +86,7 @@ public class GuildSettleRecordAdminService { } String curCycleDate = FullMonthCycleTimeUtil.getCurCycleDateByZoneId(partitionInfo.getZoneId()); - if (curCycleDate.equals(basePageParams.getDateCycle())){ + if (curCycleDate.equals(basePageParams.getDateCycle()) || basePageParams.getDateCycle().equals("2025-09-01")){ String endDate = FullMonthCycleTimeUtil.getCurCycleEndDateByZoneId(partitionInfo.getZoneId()); List poList = guildSettleService.cal(basePageParams.getPartitionId(), curCycleDate, endDate, gId, basePageParams.getRegionId()); if (CollectionUtils.isEmpty(poList)){