From c43a23fc14c317b3a79fe5d8000ae17b9610e3ba Mon Sep 17 00:00:00 2001 From: zhengyuxuan <zhengyuxuan1995> Date: 星期二, 25 三月 2025 15:35:17 +0800 Subject: [PATCH] fix:统计 --- LifePayment/LifePayment.Domain/Common/ChannelFilter.cs | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 deletions(-) diff --git a/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs b/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs index f4d0a5e..30aa047 100644 --- a/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs +++ b/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs @@ -5,6 +5,7 @@ using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Channels; using System.Threading.Tasks; using Volo.Abp; using Volo.Abp.Application.Services; @@ -17,11 +18,28 @@ { public class ChannelFilter : AbstractChannelFilter { - public async override Task<IQueryable<ChannelsBase>> GetChannelFilter(IQueryable<ChannelsBase> query) + public override IQueryable<LifePayOrder> GetChannelLifePayOrderFilter(IQueryable<LifePayOrder> query) { - var queryUser = UserChannleRepository.Where(r => r.UserId == CurrentUser.Id).Select(s => s.ChannleId).ToList(); - var queryResult = query.Where(s => queryUser.Contains(s.ChannleId)); - return queryResult; + if (CurrentUser.ClientId == Constant.ClientType.Back && !CurrentUser.IsSystem) + { + var queryUser = UserChannleRepository.Where(r => r.UserId == CurrentUser.Id).Select(s => s.ChannleId).ToList(); + var queryResult = query.Where(s => (!string.IsNullOrEmpty(s.ChannelId) && queryUser.Contains(s.ChannelId)) || string.IsNullOrEmpty(s.ChannelId) || queryUser.Count() == 0); + return queryResult; + } + + return query; + } + + public override IQueryable<LifePayUser> GetChannelLifePayUserFilter(IQueryable<LifePayUser> query) + { + if (CurrentUser.ClientId == Constant.ClientType.Back && !CurrentUser.IsSystem) + { + var queryUser = UserChannleRepository.Where(r => r.UserId == CurrentUser.Id).Select(s => s.ChannleId).ToList(); + var queryResult = query.Where(s => (!string.IsNullOrEmpty(s.CreationChannleNum) && queryUser.Contains(s.CreationChannleNum)) || string.IsNullOrEmpty(s.CreationChannleNum)); + return queryResult; + } + + return query; } } -- Gitblit v1.9.1