From 3b97aab1ed1a9edeb008ba6fa561d52c9e02a008 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Mon, 2 Aug 2021 17:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BB=A9=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/MarketPercentageController.class.php  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/MarketPercentageController.class.php b/Application/Admin/Controller/MarketPercentageController.class.php
index 24d1dfe6c..751d73030 100644
--- a/Application/Admin/Controller/MarketPercentageController.class.php
+++ b/Application/Admin/Controller/MarketPercentageController.class.php
@@ -724,18 +724,17 @@ class MarketPercentageController extends ThinkController
         $this->assign('end_time', $end_time);
 
         $data = SM("market_altogether", "tab_")
+            ->alias("m")->field("m.*,a.group_id")
+            ->join("sys_auth_group_access as a on m.admin_id = a.uid")
             ->where($map);
 
 
         if ($_REQUEST['export']) {
             $data = $data
-                ->field("*")
                 ->order("pay_time DESC,pay_amount DESC")
                 ->select();
         } else {
             $data = $data
-                ->field("*")
-//                ->page($p, $row)
                 ->order("pay_time DESC,pay_amount DESC")
                 ->select();
         }
@@ -793,7 +792,7 @@ class MarketPercentageController extends ThinkController
         $this->returnWaitMarketPercentageArray = $this->marketPercentage->returnWaitMarketPercentageArray();
 
         foreach ($data as $key => $value) {
-            $level = $value['level'];
+            $level = $value['group_id'];
             if (isset($marketPercentage[$level])) {
                 $value['market_percentage'] = $marketPercentage[$level];
             }