diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 41536cf67..ac89ce8c0 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -298,7 +298,6 @@ class StatementMangementController extends ThinkController list($confirm_time_start, $confirm_time_end) = explode('~', $params['confirm_time_range']); $map .= " and r.confirm_time between " . strtotime(trim($confirm_time_start)) . " and " . (strtotime(trim($confirm_time_end))+86400); } - if (!empty($params['detail_company_type'])) { $map .= " and rd.company_type = {$params['detail_company_type']} "; } @@ -327,6 +326,14 @@ class StatementMangementController extends ThinkController // $map .= " and rd.company_name = '{$params['detail_company_name']}' "; // } } + //判断内外团 + if(!empty($params['detail_company_type']) && $params['detail_company_type']== 2 && (I('company_belong', -1) >= 0)){ + $company_belong = $params['company_belong']; + $company_id = M("promote_company","tab_")->where("company_belong = '{$company_belong}'")->getField("id",true); + $company_id = implode(",",$company_id); + $detail_company_name = self::INSIDE_COMPANY[$params['detail_company_id']]; + $map .= " and rd.company_id in ({$company_id }) "; + } // 判断会长 if (I('detail_promote_account', -1) >= 0) { @@ -436,6 +443,7 @@ class StatementMangementController extends ThinkController // ksort($record); $this->assign('list', $record); $this->assign('promoters', array_column(SM('promote', 'tab_')->where(['level'=>1])->field('id, nickname, account')->select(), null, 'id')); + $this->assign('company_belong',getCompanyBlong()); $this->checkListOrCountAuthRestMap($map,[]); diff --git a/Application/Admin/View/StatementMangement/rewardManageList.html b/Application/Admin/View/StatementMangement/rewardManageList.html index 596e8ec01..be47163c6 100644 --- a/Application/Admin/View/StatementMangement/rewardManageList.html +++ b/Application/Admin/View/StatementMangement/rewardManageList.html @@ -117,6 +117,15 @@ +
+