From 36d9c70e5d2735e0ff9e5f44a69b62830d96adfd Mon Sep 17 00:00:00 2001
From: liqianjin <949671634@qq.com>
Date: Thu, 31 Oct 2024 15:02:25 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E5=9B=A2=E9=98=9F=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 addon/fenxiao/api/controller/Fenxiao.php | 3 ++-
 addon/fenxiao/model/Fenxiao.php          | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/addon/fenxiao/api/controller/Fenxiao.php b/addon/fenxiao/api/controller/Fenxiao.php
index 8ac3266..6ea9562 100644
--- a/addon/fenxiao/api/controller/Fenxiao.php
+++ b/addon/fenxiao/api/controller/Fenxiao.php
@@ -343,7 +343,8 @@ class Fenxiao extends BaseApi
         $condition = [
             [ 'f.site_id', '=', $this->site_id ],
             [ 'f.chain', 'like', '%'.$fenxiao_info[ 'fenxiao_id' ].'%' ],
-            [ 'm.is_delete', '=', 0 ]
+            [ 'm.is_delete', '=', 0 ],
+            [ 'f.chain' , '<>' ,'226,']
         ];
         $field = 'm.nickname,m.headimg,m.member_id,m.order_num,m.order_money,f.fenxiao_id,f.audit_time,f.level_name,m.is_fenxiao,m.bind_fenxiao_time,f.one_child_num,f.one_child_fenxiao_num';
         $join = [ [ 'member m', 'm.member_id = f.member_id', 'inner' ] ];
diff --git a/addon/fenxiao/model/Fenxiao.php b/addon/fenxiao/model/Fenxiao.php
index 36dd7ba..e62cc92 100644
--- a/addon/fenxiao/model/Fenxiao.php
+++ b/addon/fenxiao/model/Fenxiao.php
@@ -248,7 +248,7 @@ class Fenxiao extends BaseModel
                 $one_level_fenxiao = model('fenxiao')->getColumn([['parent', '=', $fenxiao_id]], 'fenxiao_id');
                 // 直属下级分销商的下级分销商 + 直属下级分销商的会员
                 if (!empty($one_level_fenxiao)) {
-                    $condition = "f.grand_parent in (" . implode(',',$one_level_fenxiao) . ")";
+                    $condition = "f.parent in (" . implode(',',$one_level_fenxiao) . ")";
                 }
                 break;
         }
@@ -287,8 +287,9 @@ class Fenxiao extends BaseModel
                 // 直属下级分销商的下级分销商 + 直属下级分销商的会员
                 if (!empty($one_level_fenxiao)) {
                     $or = " OR (f.grand_parent in (" . implode(',',$one_level_fenxiao) . ") ) ";
-                    $condition = "( (m.is_fenxiao = 0 AND m.fenxiao_id in (" . implode(',', $one_level_fenxiao) . ") )" . $or . ") AND m.is_delete = 0";
+                    $condition = "( (m.fenxiao_id in (" . implode(',', $one_level_fenxiao) . ") )" . $or . ") AND m.is_delete = 0";
                 }
+
                 break;
         }
         if (empty($condition)) return 0;