From 624a896f37475e213947da00f1c82c8404e08cc7 Mon Sep 17 00:00:00 2001
From: zhengyuxuan <zhengyuxuan1995>
Date: 星期三, 19 三月 2025 17:03:17 +0800
Subject: [PATCH] 合并
---
LifePayment/LifePayment.Domain/Common/ChannelFilter.cs | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs b/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs
index 6a00c6f..521da7e 100644
--- a/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs
+++ b/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs
@@ -23,7 +23,19 @@
if (CurrentUser.ClientId == Constant.ClientType.Back)
{
var queryUser = UserChannleRepository.Where(r => r.UserId == CurrentUser.Id).Select(s => s.ChannleId).ToList();
- var queryResult = query.Where(s => (s.ChannelId && queryUser.Contains(s.ChannelId.Value)) || !s.ChannelId.HasValue);
+ var queryResult = query.Where(s => (!string.IsNullOrEmpty(s.ChannelId) && queryUser.Contains(s.ChannelId)) || string.IsNullOrEmpty(s.ChannelId));
+ return queryResult;
+ }
+
+ return query;
+ }
+
+ public override IQueryable<LifePayUser> GetChannelLifePayUserFilter(IQueryable<LifePayUser> query)
+ {
+ if (CurrentUser.ClientId == Constant.ClientType.Back)
+ {
+ 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;
}
--
Gitblit v1.10.0