From 964e180a4ae51d5d8e5d06fc3034e4d8a80945ee Mon Sep 17 00:00:00 2001 From: liaozetao <1107136310@qq.com> Date: Thu, 26 Oct 2023 19:57:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BB=93=E7=AE=97=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E9=97=AE=E9=A2=983?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/flow/FlowTeamSettlementBizService.java | 3 ++- .../resources/xuanyin/mappers/FlowTeamSettlementInfoMapper.xml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/flow/FlowTeamSettlementBizService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/flow/FlowTeamSettlementBizService.java index ca7dcd82e..918c0a7fe 100644 --- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/flow/FlowTeamSettlementBizService.java +++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/flow/FlowTeamSettlementBizService.java @@ -11,6 +11,7 @@ package com.accompany.business.service.flow; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.accompany.common.constant.Constant; import com.accompany.common.redis.RedisKey; import com.accompany.common.status.BusiStatus; @@ -171,7 +172,7 @@ public class FlowTeamSettlementBizService { List withoutDataMonth = handleWithoutDataMonth(last12Months); resInfos.addAll(settlementInfos); resInfos.addAll(withoutDataMonth); - resInfos = resInfos.stream().sorted(Comparator.comparing(FlowTeamSettlementInfo::getMonth).reversed()).collect(Collectors.toList()); + resInfos = resInfos.stream().filter(v -> StrUtil.isNotEmpty(v.getMonth())).sorted(Comparator.comparing(FlowTeamSettlementInfo::getMonth).reversed()).collect(Collectors.toList()); return resInfos; } diff --git a/xuanyin-flow-team/xuanyin-flow-team-service/src/main/resources/xuanyin/mappers/FlowTeamSettlementInfoMapper.xml b/xuanyin-flow-team/xuanyin-flow-team-service/src/main/resources/xuanyin/mappers/FlowTeamSettlementInfoMapper.xml index 19664f77b..c24f9802e 100644 --- a/xuanyin-flow-team/xuanyin-flow-team-service/src/main/resources/xuanyin/mappers/FlowTeamSettlementInfoMapper.xml +++ b/xuanyin-flow-team/xuanyin-flow-team-service/src/main/resources/xuanyin/mappers/FlowTeamSettlementInfoMapper.xml @@ -182,7 +182,7 @@ count(1) as totalGiveNum, ifnull(sum(dgh.diamond_num / 1000), 0) as totalGiveAmount from flow_team_member_invite_user as fi - left join diamond_give_history as dgh on dgh.to_uid = fi.uid + inner join diamond_give_history as dgh on dgh.to_uid = fi.uid where 1 = 1 and dgh.create_time >= #{queryLimitTime}