From 8aa17c4cf03eb8813a48c5d25bdcde9dbe2e13ec Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 20 Nov 2023 10:14:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=96=87=E5=88=9B?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E4=B8=8D=E5=8F=82=E5=8A=A0=E5=8F=8A=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=8E=92=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/team-dividend/src/admin/TeamAgencyController.php    | 2 +-
 plugins/team-dividend/src/models/TeamDividendLevelModel.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/team-dividend/src/admin/TeamAgencyController.php b/plugins/team-dividend/src/admin/TeamAgencyController.php
index d899e3e6..640e6adf 100644
--- a/plugins/team-dividend/src/admin/TeamAgencyController.php
+++ b/plugins/team-dividend/src/admin/TeamAgencyController.php
@@ -118,7 +118,7 @@ class TeamAgencyController extends BaseController
             // 排名处理
             $list['data'][$key]['rank_list'] = array_filter(array_map(function($rankInfo) use ($item){
                 $rankSort = (string)$rankInfo['up_log'][$item['uid']];
-                if($rankSort === '0' || $rankSort) {
+                if(($rankSort === '0' || $rankSort) && $rankInfo['level_type'] == 0) {
                     return [
                         'id' => $rankInfo['id'],
                         'level_name' => $rankInfo['level_name'],
diff --git a/plugins/team-dividend/src/models/TeamDividendLevelModel.php b/plugins/team-dividend/src/models/TeamDividendLevelModel.php
index c35e415b..a10ce306 100644
--- a/plugins/team-dividend/src/models/TeamDividendLevelModel.php
+++ b/plugins/team-dividend/src/models/TeamDividendLevelModel.php
@@ -232,7 +232,7 @@ class TeamDividendLevelModel extends BackendModel
     public static function getRanking(){
         // 获取全部经销商  以此来获取排名信息
         $upRank = TeamDividendLevelModel::uniacid()
-            ->select(['id','level_name','level_weight'])
+            ->select(['id','level_name','level_weight','level_type'])
             ->with(['upLog'=>function($query){
                 $query->select(['id','uid','after_level_id','created_at'])
                     ->orderBy('created_at','ASC')
@@ -244,6 +244,7 @@ class TeamDividendLevelModel extends BackendModel
             return [
                 'id' => $upItem->id,
                 'level_name' => $upItem->level_name,
+                'level_type' => $upItem->level_type,
                 'up_log' => array_flip($upItem->upLog->pluck('uid')->toArray()),
             ];
         })->toArray();