Merge branch 'hotfix/add_prompte_relation' of wmtx/platform into master

优化新增会长关系不跟随

Application/Admin/Controller/OldCountController.class.php

@@ -205,13 +205,14 @@ class OldCountController extends \Think\Controller
     public function promoteCompanyBelongInit()
     {
         //获取所有公司
-       $comoany =  M("PromoteCompany","tab_")->field("id,company_belong")->select();
+       $comoany =  M("PromoteCompany","tab_")->field("id,company_belong,develop_type")->select();
-       $comoany[] = ["id"=>0,"company_belong"=>0]; //海南万盟
+       $comoany[] = ["id"=>0,"company_belong"=>0,"develop_type"=>0]; //海南万盟
        $count = count($comoany);
        $promote = M("Promote","tab_");
        for ($i=0; $i < $count; $i++) { 
            $savedata = array(
-             "company_belong"=>$comoany[$i]['company_belong']
+             "company_belong"=>$comoany[$i]['company_belong'],
+             "company_relation"=>$comoany[$i]['develop_type'],
            );
            $tmpid = $comoany[$i]['id'];
            $promote->where("company_id ='{$tmpid}'")->save($savedata);

Application/Admin/Controller/PromoteController.class.php

@@ -289,7 +289,10 @@ class PromoteController extends ThinkController
             $company_belong = $_REQUEST['company_belong'] ?? 0;
             $company_relation = $_REQUEST['company_relation'] ?? 0;
             if($company_id && $company_id > 0){
-                $company_belong = M("PromoteCompany","tab_")->field("company_belong")->where("id = {$company_id}")->find()['company_belong'];
+                //新增跟随系统
+                $company_info = M("PromoteCompany","tab_")->field("company_belong,develop_type")->where("id = {$company_id}")->find(); 
+                $company_belong = $company_info['company_belong'];
+                $company_relation = $company_info['develop_type'];
             }
             $data = array(
                 'account'=>$account,