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

修改功能

Application/Admin/Controller/UserController.class.php

@@ -387,6 +387,15 @@ class UserController extends AdminController
                     $this->error('该手机号码已经添加过！');
                 }
             }
+
+            $group =  M('auth_group', 'sys_')->where(['id' => I('auth')])->find();
+            if (is_null($group)) {
+                $this->error('角色类型不存在！');
+            } else {
+                if (!IS_ROOT && strpos($group['title'], '市场专员') !== false && !isMarketLeader()) {
+                    $this->error('市场专员编辑仅允许市场总监操作！');
+                }
+            }
 //            if (isset($_POST['mobile']) && $_POST['mobile'] != '') {
 //                $dx = A('Phone');
 //                $res = $dx->check_tel_code($_POST['mobile'], $_POST['code']);

Application/Base/Service/PromoteCompanyService.class.php

@@ -281,12 +281,17 @@ class PromoteCompanyService
 
     private function savePromotes($records, $company, $creator)
     {
+        $status = 1;
+        /* if (C('PROMOTE_AUTO_AUDIT') == 1) {
+            $status = 1;
+        } */
         $promoteService = new PromoteService();
         foreach ($records as $record) {
             $promoteService->addPromote([
                 'account' => $record['account'],
                 'password' => $record['password'],
                 'real_name' => $record['real_name'],
+                'status' => $status,
                 'email' => $record['email'],
                 'mobile_phone' => $record['mobile_phone'],
                 'can_view_recharge' => $record['can_view_recharge'],

Application/Home/Controller/BaseController.class.php

@@ -391,6 +391,19 @@ class BaseController extends HomeController
         if ($permission == 'view-user-recharge') {
             $promoteService = new PromoteService();
             $topPromote = $promoteService->getTopPromote($promote);
+
+            /**
+             * 市场部特殊推广公司的规则
+             */
+            $onlyPresidentList = [330, 331, 332];
+            if (in_array($topPromote['company_id'], $onlyPresidentList)) {
+                if ($topPromote['can_view_recharge'] == 1 && $promote['level'] == 1) {
+                    return true;
+                } else {
+                    return false;
+                }
+            }
+
             if ($topPromote['can_view_recharge'] == 1) {
                 return true;
             }