Merge branch 'feature/version_1028' of wmtx/platform into release

修改数据汇总bug

Application/Home/Controller/DownloadController.class.php

@@ -2280,15 +2280,15 @@ class DownloadController extends BaseController {
         $rs = M('promote','tab_')->where($map1)->field('id,account,nickname')->select();
         $childPromoteIds = '';
         if(empty($rs)) {
-            $map['tab_user.promote_id'] = PID;
+            $map['tab_apply.promote_id'] = PID;
         }else {
              foreach ($rs as $rsKey => $rsValue) {
                 $id = $rsValue['id'];
                 $childPromoteIds .= $id.',';
             }
-           $childPromoteIds = rtrim($childPromoteIds, ',');
-           $childPromoteIds .= ',' . PID;
-           $map['tab_apply.promote_id'] = ['in', $childPromoteIds];
+            $childPromoteIds = rtrim($childPromoteIds, ',');
+            $childPromoteIds .= ',' . PID;
+            $map['tab_apply.promote_id'] = ['in', $childPromoteIds];
         }
         $levelPromote = $this->getLevelPromote();
         $queryPromote = $this->getQueryPromote($levelPromote);