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 b3ddb3378..7d411f1f4 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 @@ -88,6 +88,11 @@ public class GuildSettleRecordAdminService { String curCycleDate = FullMonthCycleTimeUtil.getCurCycleDateByZoneId(partitionInfo.getZoneId()); if (curCycleDate.equals(basePageParams.getDateCycle()) || basePageParams.getDateCycle().equals("2025-09-01")){ String endDate = FullMonthCycleTimeUtil.getCurCycleEndDateByZoneId(partitionInfo.getZoneId()); + if (!curCycleDate.equals(basePageParams.getDateCycle())){ + curCycleDate = basePageParams.getDateCycle(); + endDate = "2025-09-30"; + } + List poList = guildSettleService.cal(basePageParams.getPartitionId(), curCycleDate, endDate, gId, basePageParams.getRegionId()); if (CollectionUtils.isEmpty(poList)){ return voPage;