From d7662eb305dc8fe813fe1c89b36de8c37a7b29a7 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 18 Mar 2020 16:16:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E5=BD=92=E5=B1=9E=E4=BA=8E=E5=85=AC=E5=8F=B8=E5=9B=A2=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PromoteController.class.php | 6 +++++-
 Application/Admin/Model/PromoteModel.class.php           | 2 +-
 Application/Admin/View/Promote/lists.html                | 9 +++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 74e8e64be..3adbadd69 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -245,6 +245,9 @@ 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'];
+            }
             $data = array(
                 'account'=>$account,
                 'password'=>$password,
@@ -1309,9 +1312,10 @@ class PromoteController extends ThinkController
         //为数据权限添加
         setPowerPromoteIds($map, 'pb.promote_id');
         $model = M('promote_belong', 'tab_');
+        $default_company = C('DEFAULT_COMPANY');
         $field = "
             pb.id,pb.promote_id,pb.verify_status,pb.company_relation,pb.remark,pb.can_view_recharge,pb.approver_name,pb.applicant_name,pb.verify_time,pb.applicant_time,pb.company_type,
-            pc.company_name,
+            IFNULL(pc.company_name,'{$default_company}') company_name,
             p.company_belong,p.account,p.mobile_phone,p.admin_id,p.ver_status,p.status,p.create_time
         ";
         $list_data = $model->alias('pb')
diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php
index e23869964..32da8b7dc 100644
--- a/Application/Admin/Model/PromoteModel.class.php
+++ b/Application/Admin/Model/PromoteModel.class.php
@@ -424,7 +424,7 @@ class PromoteModel extends Model{
         $parseData = array();
         foreach ($result as $key => $value) {
             $parseData[$key] = $value;
-            $parseData[$key]['company_belong_str'] = $value['company_belong'] ? '外团' : '内团';
+            $parseData[$key]['company_belong_str'] = getCompanyBlong($value['company_belong']);
             $parseData[$key]['company_relation_str'] = $value['company_relation'] ? '只维护' : '自主开发及维护';
         }
         return $parseData;
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index 014df7416..a5a89189b 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -144,10 +144,11 @@
                 </div>
 
                 <div class="input-list input-list-channelstatus">
-                    <select name="company_belong">
-                        <option value="">内外团</option>
-                        <option value="0">内团</option>
-                        <option value="1">外团</option>
+                    <select name="company_belong" class="select_gallery">
+                        <option value="">请选择团体类型</option>
+                        <volist name=":getCompanyBlong()" id="vo">
+                            <option value="{$vo.id}" <php> if($_GET['company_belong'] !='' && $vo['id'] == $_GET['company_belong'])echo selected;</php>>{$vo.name}</option>
+                        </volist>
                     </select>
                 </div>
                 <else/>