Merge pull request '优化绩效' (#439) from feature/more_payment into master

Reviewed-on: http://8.136.139.249:3000/wmtx/platform/pulls/439

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];
             }