diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index e66e369ce..bbbf2e37e 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -5977,6 +5977,9 @@ class ExportController extends Controller if (I('status')) { $map['tab_promote.status'] = I('status'); } + if (strlen(I('company_belong'))) { + $map['company_belong'] = I("company_belong"); + } //为数据权限添加 setPowerPromoteIds($map, 'tab_promote.id'); diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 77f612312..3d690fac7 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -96,6 +96,9 @@ class PromoteController extends ThinkController if (I("promote_level")) { $map['level'] = I("promote_level"); } + if (strlen(I('company_belong'))) { + $map['company_belong'] = I("company_belong"); + } $this->m_title = '推广员列表'; $this->assign('commonset', M('Kuaijieicon')->where(['url'=>'Promote/lists/type/1','status'=>1])->find()); if (isset($_REQUEST['row'])) { @@ -221,6 +224,10 @@ class PromoteController extends ThinkController if ($this->accountExist($account)) { $this->error('该账号已存在'); } + $res = M('promote', 'tab_')->where(['mobile_phone' => $mobile_phone])->field('id')->find(); + if ($res) { + $this->error('该手机号已存在'); + } $company_belong = $_REQUEST['company_belong'] ?? 0; $company_relation = $_REQUEST['company_relation'] ?? 0; $data = array( diff --git a/Application/Admin/Controller/StatementMangementController.class.php b/Application/Admin/Controller/StatementMangementController.class.php index 2f21630e9..504d22e38 100644 --- a/Application/Admin/Controller/StatementMangementController.class.php +++ b/Application/Admin/Controller/StatementMangementController.class.php @@ -48,7 +48,6 @@ class StatementMangementController extends ThinkController // var_dump($data);die(); foreach ($data as $key => $value) { $data[$key]['order'] = json_decode($value['second_party_info'],true)['order_type']; - var_dump($data[$key]['order']); } $sumData = M("statement","tab_") diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html index af4885d9d..831cd5a17 100644 --- a/Application/Admin/View/Promote/lists.html +++ b/Application/Admin/View/Promote/lists.html @@ -135,6 +135,14 @@ + +