diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardService.java index e670c002d..313098d91 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/guild/GuildMemberWeekLevelRewardService.java @@ -115,7 +115,7 @@ public class GuildMemberWeekLevelRewardService extends ServiceImpl itemVoList = new ArrayList<>(); vo.setItemList(itemVoList); - String curLevel = "", preLevel = "-"; + String curLevel = "-", preLevel = "-"; for (GuildMemberWeekLevelReward levelReward: levelRewardList) { @@ -158,9 +158,11 @@ public class GuildMemberWeekLevelRewardService extends ServiceImpl= 0){ + if (userProcess.compareTo(levelReward.getMaxNum()) >= 0){ curLevel = levelReward.getLevel(); - } else if (needFilter) { + } + + if (needFilter) { break; } @@ -261,7 +263,7 @@ public class GuildMemberWeekLevelRewardService extends ServiceImpl levelRewardList = lambdaQuery() .eq(GuildMemberWeekLevelReward::getPartitionId, partitionId) - .orderByAsc(GuildMemberWeekLevelReward::getLevel) + .orderByAsc(GuildMemberWeekLevelReward::getMaxNum) .list(); if (CollectionUtils.isEmpty(levelRewardList)){ return null;