From 43e28aece364ad351d61eca30c6707fcdc197ca4 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期五, 23 五月 2025 09:11:41 +0800
Subject: [PATCH] fix: s

---
 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 11cde80..2043352 100644
--- a/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs
+++ b/LifePayment/LifePayment.Domain/Common/ChannelFilter.cs
@@ -18,13 +18,31 @@
 {
     public class ChannelFilter : AbstractChannelFilter
     {
-        public  override IQueryable<LifePayOrder> GetChannelLifePayOrderFilter(IQueryable<LifePayOrder> query)
+        public override IQueryable<LifePayOrder> GetChannelLifePayOrderFilter(IQueryable<LifePayOrder> query)
         {
-            if (CurrentUser.ClientId == Constant.ClientType.Back)
+            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 => (s.ChannelId.HasValue && queryUser.Contains(s.ChannelId.Value)) || !s.ChannelId.HasValue);
-                return queryResult;
+                if (queryUser.Count() > 0)
+                {
+                    var queryResult = query.Where(s => (!string.IsNullOrEmpty(s.ChannelId) && queryUser.Contains(s.ChannelId)));
+                    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();
+                if (queryUser.Count() > 0)
+                {
+                    var queryResult = query.Where(s => (!string.IsNullOrEmpty(s.CreationChannleNum) && queryUser.Contains(s.CreationChannleNum)));
+                    return queryResult;
+                }
             }
 
             return query;

--
Gitblit v1.9.1