Merge branch 'hotfix/fan_promote' of wmtx/platform into release

修改工会统计bug

Application/Admin/Controller/FinancePromoteController.class.php

@@ -275,6 +275,9 @@ class FinancePromoteController extends AdminController
             if($istimeselect){
                 $map['s.payed_time']=$istimeselect;
             }
+            if ($adminId > 0) {
+                $map['s.market_admin_id'] = $adminId;
+            }
             $map['s.pay_status']=1;
             $field= "SUM(CASE WHEN pay_way > 0 THEN pay_amount ELSE 0 END) as cash_count,
                     SUM(CASE WHEN pay_way = 0 THEN pay_amount ELSE 0 END) as balance_coin_count,