From f291f615859f129265f740526cba144415d7b49e Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期一, 07 四月 2025 10:32:47 +0800
Subject: [PATCH] fix:bug修复
---
LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs | 3 ++-
LifePayment/LifePayment.Application/LifePay/StatisticsService.cs | 7 ++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
index a4e22f2..4c748a6 100644
--- a/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
+++ b/LifePayment/LifePayment.Application/LifePay/StatisticsService.cs
@@ -206,8 +206,9 @@
public async Task<ChannelDataListOutPut> GetChannelDataList(List<string> channleList)
{
int maxStatisticsNumber = 5;
- var statistics = await _lifePayChannlesRakeRepository
- .WhereIf(channleList != null && channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
+ /// 杩欓噷涓嶅姞鍏�.Where()浼氭姤閿�
+ var statistics = await _lifePayChannlesRakeRepository.Where(x => x.IsDeleted == false)
+ .WhereIf(channleList.Count() > 0, x => channleList.Contains(x.ChannelId))
.ToListAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(statistics == null, "娓犻亾鏀舵缁熻澶辫触");
var groupedStatistics = statistics
@@ -238,7 +239,7 @@
}
/// 绱鐢ㄦ埛
- var users = await _lifePayUserRepository.WhereIf(channleList.Count() > 0, x => channleList.Contains(x.CreationChannleNum))
+ var users = await _lifePayUserRepository.Where(x => x.IsDeleted == false).WhereIf(channleList.Count() > 0, x => channleList.Contains(x.CreationChannleNum))
.ToListAsync();
CheckExtensions.IfTrueThrowUserFriendlyException(statistics == null, "绱鐢ㄦ埛缁熻澶辫触");
var groupedUsers = users
diff --git a/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs b/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs
index faf1cb5..14055d4 100644
--- a/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs
+++ b/LifePayment/LifePayment.Domain/LifePay/LifePayChannlesRake.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using Volo.Abp;
using Volo.Abp.Domain.Entities.Auditing;
namespace LifePayment.Domain.LifePay
@@ -6,7 +7,7 @@
/// <summary>
/// 鍒嗕剑
/// </summary>
- public class LifePayChannlesRake : FullAuditedEntity<Guid>
+ public class LifePayChannlesRake : FullAuditedEntity<Guid>, IDataUserFilter
{
public LifePayChannlesRake()
{
--
Gitblit v1.9.1