From d7737291ed740f92e3956d2cb3b1ed7352680624 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 18 Mar 2020 10:48:53 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E6=9A=82=E5=AD=981?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/access_data_foldline.txt |  1 -
 .../Admin/View/Promote/belong_add.html        | 39 +++----------------
 2 files changed, 5 insertions(+), 35 deletions(-)
 delete mode 100644 Application/Admin/Controller/access_data_foldline.txt

diff --git a/Application/Admin/Controller/access_data_foldline.txt b/Application/Admin/Controller/access_data_foldline.txt
deleted file mode 100644
index 06372c756..000000000
--- a/Application/Admin/Controller/access_data_foldline.txt
+++ /dev/null
@@ -1 +0,0 @@
-{"news":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"sum":{"news":0,"active":2,"player":0,"money":0},"active":[{"time":"0:00","count":1},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":1},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"player":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}],"money":[{"time":"0:00","count":0},{"time":"1:00","count":0},{"time":"2:00","count":0},{"time":"3:00","count":0},{"time":"4:00","count":0},{"time":"5:00","count":0},{"time":"6:00","count":0},{"time":"7:00","count":0},{"time":"8:00","count":0},{"time":"9:00","count":0},{"time":"10:00","count":0},{"time":"11:00","count":0},{"time":"12:00","count":0},{"time":"13:00","count":0},{"time":"14:00","count":0},{"time":"15:00","count":0},{"time":"16:00","count":0},{"time":"17:00","count":0},{"time":"18:00","count":0},{"time":"19:00","count":0},{"time":"20:00","count":0},{"time":"21:00","count":0},{"time":"22:00","count":0},{"time":"23:00","count":0}]}
\ No newline at end of file
diff --git a/Application/Admin/View/Promote/belong_add.html b/Application/Admin/View/Promote/belong_add.html
index 145dea6b5..3d0814dac 100644
--- a/Application/Admin/View/Promote/belong_add.html
+++ b/Application/Admin/View/Promote/belong_add.html
@@ -171,41 +171,12 @@
         Think.setValue("category", {$data.category|default = 0});
         $(".select_gallery").select2();
         $(function(){
-            showTab();
-            prov="{:substr($data['bank_area'],0,2)}";
-            city="{:substr($data['bank_area'],2,2)}";
-            ciarea="{:substr($data['bank_area'],4,2)}";
-
+            $("#promote_id").on("select2:select",function(e){
+                console.log(e);
+            })
+            // showTab();
         });
-        //得到地区码
-        function getAreaID(){
-            var area = 0;
-            if($("#seachdistrict").val() != "0"){
-                area = $("#seachdistrict").val();
-            }else if ($("#seachcity").val() != "0"){
-                area = $("#seachcity").val();
-            }else{
-                area = $("#seachprov").val();
-            }
-            return area;
-        }
-
-
-        //根据地区码查询地区名
-        function getAreaNamebyID(areaID){
-            var areaName = "";
-            if(areaID.length == 2){
-                areaName = area_array[areaID];
-            }else if(areaID.length == 4){
-                var index1 = areaID.substring(0, 2);
-                areaName = area_array[index1] + " " + sub_array[index1][areaID];
-            }else if(areaID.length == 6){
-                var index1 = areaID.substring(0, 2);
-                var index2 = areaID.substring(0, 4);
-                areaName = area_array[index1] + " " + sub_array[index1][index2] + " " + sub_arr[index2][areaID];
-            }
-            return areaName;
-        }
+        
     </script>
 </block>
 

From dd86a85485e27498400e96cd450275a69a88d374 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 18 Mar 2020 14:55:57 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E5=BD=92=E5=B1=9E=E7=AE=A1=E7=90=86=20=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=BD=92=E5=B1=9E=E4=B8=8D=E5=8F=AF=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/PromoteController.class.php    |  9 ++++--
 .../Admin/View/Promote/belong_add.html        | 29 ++++++++++++-------
 .../Admin/View/Promote/belong_edit.html       | 15 ++++++----
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index ef77192dc..74e8e64be 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -1309,16 +1309,21 @@ class PromoteController extends ThinkController
         //为数据权限添加
         setPowerPromoteIds($map, 'pb.promote_id');
         $model = M('promote_belong', 'tab_');
+        $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,
+            p.company_belong,p.account,p.mobile_phone,p.admin_id,p.ver_status,p.status,p.create_time
+        ";
         $list_data = $model->alias('pb')
             ->join('left join tab_promote as p on p.id=pb.promote_id')
             ->join('left join tab_promote_company as pc on pc.id = p.company_id')
             ->where($map)
-            ->field('p.*,pb.*, pc.company_name')
+            ->field($field)
             ->page($p, $row)
             ->order('verify_status asc,applicant_time asc')
             ->select();
 //        dd($model->_sql());
-//        dd($list_data);
+    //    dd($list_data);
         $count = $model->alias('pb') ->join('left join tab_promote as p on p.id=pb.promote_id')->where($map)->count();
         $page = set_pagination($count, $row);
         if ($page) {
diff --git a/Application/Admin/View/Promote/belong_add.html b/Application/Admin/View/Promote/belong_add.html
index 3d0814dac..99ad10e4e 100644
--- a/Application/Admin/View/Promote/belong_add.html
+++ b/Application/Admin/View/Promote/belong_add.html
@@ -53,29 +53,30 @@
                                 <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
                                     <option value="">请选择会长账号</option>
                                     <volist name=":promote_listsOther(1)" id="vo">
-                                        <option promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $_GET['promote_id']">selected=selected</if>>{$vo.account}</option>
+                                        <option data-company_belong="{$vo['company_belong']}" data-belong="{:getCompanyBlong($vo['company_belong'])}" promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $_GET['promote_id']">selected=selected</if>>{$vo.account}</option>
                                     </volist>
                                 </select>
                             </td>
                         </tr>
 
 
-                        <tr>
+                        <tr id="company_belong_box" style="display: none;">
                             <td class="l">工会归属：</td>
                             <td class="r table_radio">
-                        <span class="form_radio">
-                            <label >
-                                <input type="radio"  value="3" name="company_belong" checked="checked" class="company_belong"> 无
+                                <input  id="company_belong" name="company_belong" value="" type="hidden">
+                        <span class="form_radio"  id="company_belong_str">
+                            <!-- <label >
+                                <input type="radio" value="3" name="company_belong" class="company_belong"  checked="checked"> 无
                             </label >
                             <label >
-                                <input type="radio"  value="0" name="company_belong" class="company_belong"> 内团
+                                <input type="radio" value="0" name="company_belong" class="company_belong"> 内团
                             </label >
                             <label >
                                 <input type="radio" value="1" name="company_belong" class="company_belong"> 外团
                             </label>
                             <label >
-                                <input type="radio"  value="2" name="company_belong" class="company_belong"> 外团-分发联盟
-                            </label >
+                                <input type="radio" value="2" name="company_belong" class="company_belong"> 外团-分发联盟
+                            </label > -->
                             </span>
                                 <!--                            <span class="notice-text"></span>-->
                             </td>
@@ -171,8 +172,16 @@
         Think.setValue("category", {$data.category|default = 0});
         $(".select_gallery").select2();
         $(function(){
-            $("#promote_id").on("select2:select",function(e){
-                console.log(e);
+            $("#promote_id").on("change",function(e){
+                
+                var belong = $("#promote_id option:selected").data();
+                $("#company_belong_str").html(belong.belong);
+                $("#company_belong").val(belong.company_belong);
+                if(belong.company_belong > -1){
+                    $("#company_belong_box").show();
+                }else{
+                    $("#company_belong_box").hide();
+                }
             })
             // showTab();
         });
diff --git a/Application/Admin/View/Promote/belong_edit.html b/Application/Admin/View/Promote/belong_edit.html
index ae167dec6..777586f36 100644
--- a/Application/Admin/View/Promote/belong_edit.html
+++ b/Application/Admin/View/Promote/belong_edit.html
@@ -50,12 +50,15 @@
                         <tr>
                             <td class="l">会长账号：</td>
                             <td class="r">
-                                <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
+                                <input  id="promote_id" name="promote_id" value="{$data['promote_id']}" type="hidden">
+                                {:getPromoteName($data['promote_id'])}
+
+                                <!-- <select id="promote_id" name="promote_id" class="select_gallery"  style="width:120px;">
                                     <option value="">请选择会长账号</option>
                                     <volist name=":promote_listsOther(1)" id="vo">
                                         <option promote_id-id="{$vo.id}" value="{$vo.id}" <if condition="$vo.id eq $data['promote_id']">selected=selected</if>>{$vo.account}</option>
                                     </volist>
-                                </select>
+                                </select> -->
                             </td>
                         </tr>
                         <input type="hidden" name="promote_id" value="{$data['promote_id']}">
@@ -64,8 +67,10 @@
                         <tr>
                             <td class="l">工会归属：</td>
                             <td class="r table_radio">
-                        <span class="form_radio ">
-                            <label >
+                            <input  id="company_belong" name="company_belong" value="{$data['company_belong']}" type="hidden">
+                        <span class="form_radio">
+                            {:getCompanyBlong($data['company_belong'])}
+                            <!-- <label >
                                 <input type="radio" value="3" name="company_belong" <?php if($data['company_belong'] ==3):?>
                                 checked="checked"
                                 <?php endif?> class="company_belong"> 无
@@ -84,7 +89,7 @@
                                 <input type="radio" value="2" name="company_belong" <?php if($data['company_belong'] ==2):?>
                                 checked="checked"
                                 <?php endif?> class="company_belong"> 外团-分发联盟
-                            </label>
+                            </label> -->
                             </span>
                                 <!--                            <span class="notice-text"></span>-->
                             </td>

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 3/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E7=8E=B0?=
 =?UTF-8?q?=E5=9C=A8=E5=BD=92=E5=B1=9E=E4=BA=8E=E5=85=AC=E5=8F=B8=E5=9B=A2?=
 =?UTF-8?q?=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/>

From 1761d37b5c466abb663ebea25fc47a602f2cf5df Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 18 Mar 2020 16:57:19 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E9=80=82=E9=85=8D=E6=96=B0=E5=86=85?=
 =?UTF-8?q?=E5=A4=96=E5=9B=A2=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php           | 24 +++++++++++++++++++
 .../Controller/PromoteController.class.php    | 15 +++++++++---
 .../Admin/Model/PromoteModel.class.php        |  2 +-
 Application/Admin/View/Promote/lists.html     | 12 +++++-----
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index 9d1972f58..db22be30f 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -2208,6 +2208,30 @@ function a_array_unique($array){
           return $data;
       }
   }
+  /**
+   * 获取公会归属关系
+   * @author chenzhi 20200219
+   * $id 不传返回所有关系列表
+   * 传入ID 返回对应的团体关系
+   */
+  function getCompanyRelation($id = -1)
+  {
+      $data = array(
+          ["id"=>0,'name'=>"自主开发及维护"],
+          ["id"=>1,'name'=>"只维护"],
+          ["id"=>2,'name'=>"无"]
+      );
+      if($id > -1){
+        foreach($data as $k=>$v){
+            if($v['id'] == $id){
+                return $v['name'];
+                break;
+            }
+        }
+      }else{
+          return $data;
+      }
+  }
 
 /**
  * 操作日志
diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index 3adbadd69..a1ab50267 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -362,10 +362,13 @@ class PromoteController extends ThinkController
             if ($promote['level'] ==1) {//如果是会长才能修改的选项
                 if (!is_null($company_id)) {
                     $data['company_id'] = $company_id;//推广公司
+                    if($company_id == 0){
+                        $data['company_belong'] = 0;
+                    }else{
+                        $data['company_belong'] = M("PromoteCompany","tab_")->field("company_belong")->where("id = {$company_id}")->find()['company_belong'];
+                    }
                 }
-
-                $data['company_belong'] = I('company_belong');//工会归属
-                $data['company_relation'] = I('company_relation');//工会关系
+                // $data['company_relation'] = I('company_relation');//工会关系
             }
             $settlementType = intval(I('settlement_type', 1));
             if (!empty(I('settlement_type')) && in_array($settlementType, [1, 2])) {
@@ -376,6 +379,12 @@ class PromoteController extends ThinkController
                 if ($promote['level'] == 1) {//修改会长底下推广员的推广公司
                     $array = array();
                     if ($promote['company_id'] != $company_id) {
+                        //内外团关系也要跟着公司走
+                        if($company_id == 0){
+                            $array['company_belong'] = 0;
+                        }else{
+                            $array['company_belong'] = M("PromoteCompany","tab_")->field("company_belong")->where("id = {$company_id}")->find()['company_belong'];
+                        }
                         $array['company_id'] = I('company_id');
                     }
 //                    if ($promote['company_belong'] != I('company_belong')) {
diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php
index 32da8b7dc..c086e0589 100644
--- a/Application/Admin/Model/PromoteModel.class.php
+++ b/Application/Admin/Model/PromoteModel.class.php
@@ -425,7 +425,7 @@ class PromoteModel extends Model{
         foreach ($result as $key => $value) {
             $parseData[$key] = $value;
             $parseData[$key]['company_belong_str'] = getCompanyBlong($value['company_belong']);
-            $parseData[$key]['company_relation_str'] = $value['company_relation'] ? '只维护' : '自主开发及维护';
+            $parseData[$key]['company_relation_str'] = getCompanyRelation($value['company_relation']);
         }
         return $parseData;
     }
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index a5a89189b..3e0fb49bf 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -93,7 +93,7 @@
                     </select>
                 </div>
                 <div class="input-list input-list-channelstatus">
-                    <select name="promote_level">
+                    <select name="promote_level" class="select_gallery">
                         <option value="">推广员等级</option>
                         <option value="1">会长</option>
                         <option value="2">部门长</option>
@@ -118,7 +118,7 @@
                     </select>
                 </div>
                 <div class="input-list input-list-channelstatus">
-                    <select name="status">
+                    <select name="status" class="select_gallery">
                         <option value="">渠道状态</option>
                         <option value="1">正常</option>
                         <option value="2">{:L('Lock')}</option>
@@ -126,7 +126,7 @@
                     </select>
                 </div>
                 <div class="input-list input-list-channelstatus">
-                    <select name="ver_status">
+                    <select name="ver_status" class="select_gallery">
                         <option value="">审核状态</option>
                         <option value="0">未认证</option>
                         <option value="1">审核成功</option>
@@ -136,7 +136,7 @@
                     </select>
                 </div>
                 <div class="input-list input-list-channelstatus">
-                    <select name="oa_associated">
+                    <select name="oa_associated" class="select_gallery">
                         <option value="">oa关联</option>
                         <option value="1">已关联</option>
                         <option value="0">未关联</option>
@@ -202,8 +202,8 @@
                         <th ><a class="paixu" data-order='last_login_time'>最后登录时间</a></th>
                         <th>渠道类型</th>
                         <th>所属会长</th>
-                        <th>工会归属</th>
-                        <th>工会关系</th>
+                        <th>公会归属</th>
+                        <th>公会关系</th>
                         <th>归属管理员</th>
                         <th>商务专员</th>
                         <th>状态</th>

From 61d04183402b76845e8cba9dd96b945209a34861 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 18 Mar 2020 19:31:17 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=85=AC=E5=8F=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E4=BF=AE=E6=94=B9=E5=86=85=E5=A4=96?=
 =?UTF-8?q?=E5=9B=A2=E5=BD=B1=E5=93=8D=E5=BA=95=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PromoteCompanyController.class.php          | 17 ++++++++++++++++-
 .../Admin/View/PromoteCompany/lists.html        |  6 ++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index 6655838a4..f7328afe8 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -146,8 +146,10 @@ class PromoteCompanyController extends ThinkController
                     }
                     
                 }
+                $v['can_del'] = 0;
             }else{
                 //空值
+                $v['can_del'] = 1;
                 $v['list']=[
                     [
                         "account"=>"--",
@@ -313,10 +315,23 @@ class PromoteCompanyController extends ThinkController
             if(isset($save['resources'])){
                 $save['resources'] = json_encode($save['resources'],JSON_UNESCAPED_UNICODE);
             }
+            //判断内外团是否修改
+            $is_change_belong = false;
+            $company_id = $save['id'];
+            $y_belong = $model->field("company_belong")->where("id = {$save['id']}")->find()['company_belong'];
+            if(isset($save['company_belong']) && ($y_belong != $save['company_belong'])){
+                $is_change_belong = true;
+            }
             $res = $model->save($save);
             if ($res) {
                 \Think\Log::actionLog('PromoteCompany/edit', 'partner', $res);
-
+                //处理底下所有会长的公会属性
+                if($is_change_belong){
+                    $savedata = array(
+                        "company_belong"=>$save['company_belong']
+                    );
+                    M("Promote","tab_")->where("company_id = '{$company_id}'")->save($savedata);
+                }
                 addOperationLog(['op_type'=>1,'key'=>$_POST['company_name'],'op_name'=>'编辑推广公司','url'=>U('PromoteCompany/lists'),'menu'=>'推广员-推广员管理-推广公司管理-编辑推广公司']);
 
                 $array=array(
diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html
index 5f547a413..27619bd69 100644
--- a/Application/Admin/View/PromoteCompany/lists.html
+++ b/Application/Admin/View/PromoteCompany/lists.html
@@ -39,7 +39,7 @@
 
     <div class="cf main-place top_nav_list navtab_list">
         <h3 class="page_title">{$meta_title}</h3>
-        <p class="description_text">说明：该功能是用于录入工会所属的推广公司名称</p>
+        <p class="description_text">说明：该功能是用于录入工会所属的推广公司名称 / 如需删除公司请先将公司底下会长移走后方可操作</p>
     </div>        
     <div class="cf top_nav_list">
         <div class="fl button_list">
@@ -120,7 +120,9 @@
                             <td rowspan="{$data.row}">
                                 <a href="{:U('view',array('id'=>$data['id']))}">查看</a>
                                 <a href="{:U('edit',array('id'=>$data['id']))}">编辑</a>
-                                <a href="{:U('del',array('id'=>$data['id']))}" style="color: red;" class="confirm ajax-get">删除</a>
+                                <if condition="$data['can_del'] eq 1 ">
+                                    <a href="{:U('del',array('id'=>$data['id']))}" style="color: red;" class="confirm ajax-get">删除</a>
+                                </if>
                             </td>
                             <td rowspan="{$data.row}">{$data.company_name}</td>
                             <td rowspan="{$data.row}">{$data.platform_name}</td>

From f2148320a8a0e6efa6148038ca853dbc1cbe63f7 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Wed, 18 Mar 2020 19:55:19 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=AC=E4=BC=9A?=
 =?UTF-8?q?=E6=97=A7=E6=95=B0=E6=8D=AE=E5=BD=92=E5=B1=9E=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/OldCountController.class.php   | 28 +++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/OldCountController.class.php b/Application/Admin/Controller/OldCountController.class.php
index 903f911de..5602108ec 100644
--- a/Application/Admin/Controller/OldCountController.class.php
+++ b/Application/Admin/Controller/OldCountController.class.php
@@ -9,7 +9,9 @@ namespace Admin\Controller;
  */
 class OldCountController extends \Think\Controller
 {
-    //财务分类汇总统计旧数据聚合
+    /**
+     * 财务分类汇总统计旧数据聚合
+     */
     public function FinancialSummaryInit()
     {
         //清空数据库
@@ -23,7 +25,9 @@ class OldCountController extends \Think\Controller
             $Financial->setMonthFinancialSummary($v);
         }
     }
-    //超级签订单新增识别微信或者支付宝2019-12-11
+    /*
+    *超级签订单新增识别微信或者支付宝2019-12-11
+    */
     public function gameSupersignPaywayInit()
     {
         $map = array(
@@ -103,6 +107,25 @@ class OldCountController extends \Think\Controller
         }
         die("init ok");
     }
+    /**
+     * 修改公会内外团关系跟随公司 旧数据跟随 20200318
+     */
+    public function promoteCompanyBelongInit()
+    {
+        //获取所有公司
+       $comoany =  M("PromoteCompany","tab_")->field("id,company_belong")->select();
+       $comoany[] = ["id"=>0,"company_belong"=>0]; //海南万盟
+       $count = count($comoany);
+       $promote = M("Promote","tab_");
+       for ($i=0; $i < $count; $i++) { 
+           $savedata = array(
+             "company_belong"=>$comoany[$i]['company_belong']
+           );
+           $tmpid = $comoany[$i]['id'];
+           $promote->where("company_id ='{$tmpid}'")->save($savedata);
+       }
+       die("promoteCompanyBelongInit success");
+    }
     //获取公司月结所需要的所有月份截止至上个月
     public function getMonthsList()
     {
@@ -124,4 +147,5 @@ class OldCountController extends \Think\Controller
     }
     
     
+    
 }

From 55d49e8b4ba13f737bd4e50cec0236a7e0057162 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Thu, 19 Mar 2020 15:27:19 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=88=97=E8=A1=A8=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Common/extend.php           | 25 ++++++++
 .../Controller/PromoteController.class.php    | 61 +++++++++++++++----
 .../Admin/Model/PromoteModel.class.php        | 20 ++++++
 Application/Admin/View/Promote/lists.html     | 60 +++++-------------
 Application/Common/Common/extend.php          | 10 +--
 5 files changed, 116 insertions(+), 60 deletions(-)

diff --git a/Application/Admin/Common/extend.php b/Application/Admin/Common/extend.php
index db22be30f..a05e905ce 100644
--- a/Application/Admin/Common/extend.php
+++ b/Application/Admin/Common/extend.php
@@ -2232,6 +2232,31 @@ function a_array_unique($array){
           return $data;
       }
   }
+  /**
+   * 获取公会等级对应名称
+   * @author chenzhi 20200219
+   * $id 不传返回所有等级名称
+   * 传入ID 返回对应的等级名称
+   */
+  function getPromoteLeverName($id = -1)
+  {
+      $data = array(
+          ["id"=>1,'name'=>"会长"],
+          ["id"=>2,'name'=>"部门长"],
+          ["id"=>3,'name'=>"组长"],
+          ["id"=>4,'name'=>"组员"],
+      );
+      if($id > -1){
+        foreach($data as $k=>$v){
+            if($v['id'] == $id){
+                return $v['name'];
+                break;
+            }
+        }
+      }else{
+          return $data;
+      }
+  }
 
 /**
  * 操作日志
diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index a1ab50267..d70f2f0c3 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -50,7 +50,7 @@ class PromoteController extends ThinkController
             if (isset($_REQUEST['promote_id'])) {
                 $promoteid = $_REQUEST['promote_id'];
 
-                $map['id'] = $_REQUEST['promote_id'];
+                $map['p.id'] = $_REQUEST['promote_id'];
             }
             if (isset($_REQUEST['parent_id'])) {
                 if ($_REQUEST['parent_id']=='全部') {
@@ -68,12 +68,12 @@ class PromoteController extends ThinkController
                 if ($promoteid > 0 ) {
                     if (in_array($promoteid,$zidarr)) {
                         # code...
-                        $map['id'] = $promoteid;
+                        $map['p.id'] = $promoteid;
                     }else{
-                        $map['id'] = 0;
+                        $map['p.id'] = 0;
                     }
                 }else{
-                    $map['id']=array('in',$zid);
+                    $map['p.id']=array('in',$zid);
                 }
                 // 
                 unset($_REQUEST['parent_id']);
@@ -87,7 +87,7 @@ class PromoteController extends ThinkController
             }
         }
         if (I('status') || I('status', -1) == 0) {
-            $map['status'] = I('status');
+            $map['p.status'] = I('status');
         }
 
         if (I('ver_status') || I('ver_status', -1) == 0) {
@@ -95,14 +95,14 @@ class PromoteController extends ThinkController
         }
 
         if (I("promote_level")) {
-            $map['level'] = I("promote_level");
+            $map['p.level'] = I("promote_level");
         }
         if (strlen(I('company_belong'))) {
-            $map['company_belong'] = I("company_belong");
+            $map['p.company_belong'] = I("company_belong");
         }
 
         if (!is_null(I('admin_uid', null))) {
-            $map['admin_id'] = I('admin_uid');
+            $map['p.admin_id'] = I('admin_uid');
         }
 
         $this->m_title = '推广员列表';
@@ -149,8 +149,21 @@ class PromoteController extends ThinkController
 
 
         //为数据权限添加
-        setPowerPromoteIds($map, 'id');
-        $list_data = D(self::model_name)->where($map)->order('id DESC')->page($p, $row)->select();
+        setPowerPromoteIds($map, 'p.id');
+        $list_data = D(self::model_name)
+                    ->alias("p")
+                    ->field("p.*,IFNULL(m.nickname,'无') admin_nickname,IFNULL(b.account,'暂无') b_account,IFNULL(if(substring_index(substring_index(p.`chain`,'/',2),'/',-1)='',p.id,substring_index(substring_index(p.`chain`,'/',2),'/',-1)),0) top_id")
+                    ->join("sys_member m on p.admin_id = m.uid","left")
+                    ->join("tab_business_affairs b on p.ba_id = b.id","left")
+                    ->where($map)->order('id DESC');
+
+        if(isset($_REQUEST['export'])){
+            $list_data = $list_data->select(false);
+        }else{
+            $list_data =  $list_data->page($p, $row)->select(false);
+        }
+        
+        $list_data = M()->table("(".$list_data.") a")->field("a.*,pr.account top_account")->join("tab_promote pr on a.top_id = pr.id")->select();
         $list_data = D(self::model_name)->parseListData($list_data);
         $oa_data = [];
         if (I('oa_associated', -1) == -1) {
@@ -178,7 +191,33 @@ class PromoteController extends ThinkController
                 }
             }
         }
-        $count = D(self::model_name)->where($map)->count();
+        //导出
+        if(isset($_REQUEST['export'])){
+
+            $GetData = $_GET;
+            unset($GetData['export']);
+            addOperationLog(['op_type'=>3,'key'=>getNowDate(),'url'=>U(CONTROLLER_NAME.'/'.ACTION_NAME,$GetData),'menu'=>"推广员-推广员管理-推广员列表-导出"]);
+
+            data2csv($list_data,'推广员列表',array(
+                "id"=>"推广员ID",
+                "account"=>"推广员账号",
+                "mobile_phone"=>"手机号码",
+                "balance_coin"=>"平台币余额",
+                "pay_amount"=>"总流水",
+                "create_time"=>"注册时间",
+                "last_login_time"=>"最后登录时间",
+                "level_name"=>"渠道类型",
+                "top_account"=>"所属会长",
+                "company_belong_str"=>"公会归属",
+                "company_relation_str"=>"公会关系",
+                "admin_nickname"=>"归属管理员",
+                "b_account"=>"商务专员",
+                "status_str"=>"状态",
+                "ver_status"=>"身份状态",
+                "oa_associated_str"=>"oa关联"
+            ));
+        }
+        $count = D(self::model_name)->alias("p")->where($map)->count();
         $page = set_pagination($count, $row);
         if ($page) {
             $this->assign('_page', $page);
diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php
index c086e0589..6b80b7179 100644
--- a/Application/Admin/Model/PromoteModel.class.php
+++ b/Application/Admin/Model/PromoteModel.class.php
@@ -421,13 +421,33 @@ class PromoteModel extends Model{
 
     public function parseListData($result)
     {
+        //获取是否要隐藏重要信息
+        $show_data_power = (is_administrator()|| session('user_auth')['show_data']);
         $parseData = array();
         foreach ($result as $key => $value) {
             $parseData[$key] = $value;
             $parseData[$key]['company_belong_str'] = getCompanyBlong($value['company_belong']);
             $parseData[$key]['company_relation_str'] = getCompanyRelation($value['company_relation']);
+            $parseData[$key]['create_time'] = set_show_time($value['create_time']);
+            $parseData[$key]['last_login_time'] = set_show_time($value['last_login_time']);
+            $parseData[$key]['level_name'] = getPromoteLeverName($value['level']);
+            $parseData[$key]['status_str'] = get_info_status($value['status'],3) ?:"待审核";
+            $parseData[$key]['ver_status'] = get_info_status($value['ver_status'],42) ?:"未认证";
+            $parseData[$key]['oa_associated_str'] = $value['oa_associated'] == 1 ? "已关联" : "未关联";
+            $parseData[$key]['pay_amount'] = sum_promote_total_money($value['id']);
+            
+            
+            if(!$show_data_power){
+                $parseData[$key]['account'] = encryptStr($parseData[$key]['account']);
+                $parseData[$key]['mobile_phone'] = encryptStr($parseData[$key]['mobile_phone']);
+                $parseData[$key]['top_account'] = encryptStr($parseData[$key]['top_account']);
+                
+            }
+            
+
         }
         return $parseData;
+        
     }
 
 
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index 3e0fb49bf..e5e6d200d 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -227,67 +227,39 @@
                                 <td><input class="ids" type="checkbox" value="{$data['id']}" name="ids[]"></td>
                                 <td>{$data.id}</td>
                                 <td>
-                                    <if condition="$show_data_power eq true ">
-                                        {$data.account}
-                                        <else />
-                                        {$data.account|encryptStr}
-                                    </if>
+                                    {$data.account}
                                 </td>
                                 <td>
-                                    <if condition="$show_data_power eq true ">
-                                        {$data.mobile_phone}
-                                        <else />
-                                        {$data.mobile_phone|encryptStr}
-                                    </if>
+                                    {$data.mobile_phone}
                                 </td>
                                 <td>{$data.balance_coin}</td>
-                                <td>{:sum_promote_total_money($data['id'])}</td>
-                                <td>{:set_show_time($data['create_time'])}</td>
-                                <td>{:set_show_time($data['last_login_time'])}</td>
-                                <td>{:get_promote_levels($data['id'])}</td>
+                                <td>{$data['pay_amount']}</td>
+                                <td>{$data['create_time']}</td>
+                                <td>{$data['last_login_time']}</td>
+                                <td>{$data['level_name']}</td>
                                 <td>
-                                    <if condition="$show_data_power eq true ">
-                                        {:getTopPromote($data['id'])['account']}
-                                        <else />
-                                        {:encryptStr(getTopPromote($data['id'])['account'])}
-                                    </if>
+                                    {$data['top_account']}
                                 </td>
                                 <td>{$data['company_belong_str']}</td>
                                 <td>{$data['company_relation_str']}</td>
-                                <td>{:get_admin_nickname($data['admin_id'])}</td>
-                                <td>{:get_business_affairs_account($data['ba_id'])}</td>
+                                <td>{$data['admin_nickname']}</td>
+                                <td>{$data['b_account']}</td>
                                 <td>
-                                    <?php $status_str = get_info_status($data['status'],3); $status_str = $status_str ?: '待审核';?>
                                     <if condition="$data['status'] eq 0">
-                                    <span class="preview_status">{$status_str}</span>
+                                    <span class="preview_status">{$data.status_str}</span>
                                     <elseif condition="$data['status'] eq 2 " />
-                                    <span class="disabled_status">{$status_str}</span>
+                                    <span class="disabled_status">{$data.status_str}</span>
                                     <else/>
-                                    {$status_str}
+                                    {$data.status_str}
                                 </if>
                                 </td>
                                 <td>
-
-                                    <?php if($data['ver_status'] == 1) {?>
-                                    <span>成功</span>
-                                    <?php }?>
-                                    <?php if(intval($data['ver_status']) == 2) {?>
-                                    <span>拒绝</span>
-                                    <?php }?>
-                                    <?php if(intval($data['ver_status']) == 3) {?>
-                                    <span>正在审核</span>
-                                    <?php }?>
-                                    <?php if(intval($data['ver_status']) == 4) {?>
-                                    <span>修改审核中</span>
-                                    <?php }?>
-                                    <?php if(intval($data['ver_status']) == 0) {?>
-                                    <span>未认证</span>
-                                    <?php }?>
+                                    {$data['ver_status']}
                                 </td>
                                 <if condition="$data['oa_associated'] eq 1">
-                                    <td>已关联</td>
+                                    <td>{$data.oa_associated_str}</td>
                                     <else />
-                                    <td style="color: red;">未关联</td>
+                                    <td style="color: red;">{$data.oa_associated_str}</td>
                                 </if>
                                 <td><a class="ajax-view" data-id="{$data.id}">查看</a></td>
                                 <td>
@@ -368,7 +340,7 @@
     </div>
     <div class="page">
         <if condition="$is_admin eq true ">
-            <a class="sch-btn" href="{:U('Export/promote_list',array_merge(['xlsname'=>'推广员管理_推广员列表'.((I('type',1)==2)?'_混服申请':'_推广员列表')],I('get.')))}">导出</a>
+            <a class="sch-btn" href="{:U(CONTROLLER_NAME.'/'.ACTION_NAME,array_merge(['export'=>1],I('get.')))}" target="_blank">导出</a>
         </if>
         {$_page|default=''}
     </div>
diff --git a/Application/Common/Common/extend.php b/Application/Common/Common/extend.php
index 9be39bf70..b012d784e 100644
--- a/Application/Common/Common/extend.php
+++ b/Application/Common/Common/extend.php
@@ -674,13 +674,13 @@ function get_info_status($type=null,$group=0){
         33 =>array(0=>"待审核",1=>"已通过"),
         34 => ["已关闭","已开启"],
         35 => array(-1=>"审核中",1=>"正常",2=>"锁定",3=>"驳回"),
-				38 => array(0=>'待付款',1=>'交易成功',2=>'交易取消'),
-				39 => array(0=>'未打款',1=>'已打款',2=>'已驳回'),
+        38 => array(0=>'待付款',1=>'交易成功',2=>'交易取消'),
+        39 => array(0=>'未打款',1=>'已打款',2=>'已驳回'),
         36 => array(0=>"未打款",1=>"手动打款",2=>"自动打款"),
         37 => array(0=>"不参与",1=>"已参与"),
-
-				40 => array(0=>'未处理',1=>'已处理',2=>'忽略'),
-				41 => array(-1=>'已下架',0=>'待审核',1=>'已售出',2=>'已驳回',3=>'出售中',4=>'待发货',5=>'审核中'),
+        40 => array(0=>'未处理',1=>'已处理',2=>'忽略'),
+        41 => array(-1=>'已下架',0=>'待审核',1=>'已售出',2=>'已驳回',3=>'出售中',4=>'待发货',5=>'审核中'),
+        42 => array(0=>'未认证',1=>'成功',2=>'拒绝',3=>'正在审核',4=>'修改审核中'),
 
     );
     return $arr[$group][$type];

From 121fc02f1897246ea07efaf02a014bbe01f851a0 Mon Sep 17 00:00:00 2001
From: chenzhi <chenzhi063@qq.com>
Date: Fri, 20 Mar 2020 11:46:46 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E5=86=85?=
 =?UTF-8?q?=E5=A4=96=E5=9B=A2=E5=BD=92=E5=B1=9E=E4=BC=98=E5=8C=962?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PromoteCompanyController.class.php        |  3 +
 .../Controller/PromoteController.class.php    |  3 +
 Application/Admin/View/Promote/belong.html    | 68 +++++++++++--------
 Application/Admin/View/Promote/lists.html     |  4 +-
 .../Admin/View/PromoteCompany/add.html        |  7 +-
 .../Admin/View/PromoteCompany/edit.html       | 11 +--
 .../Admin/View/PromoteCompany/lists.html      |  8 +++
 7 files changed, 61 insertions(+), 43 deletions(-)

diff --git a/Application/Admin/Controller/PromoteCompanyController.class.php b/Application/Admin/Controller/PromoteCompanyController.class.php
index f7328afe8..779518460 100644
--- a/Application/Admin/Controller/PromoteCompanyController.class.php
+++ b/Application/Admin/Controller/PromoteCompanyController.class.php
@@ -39,6 +39,9 @@ class PromoteCompanyController extends ThinkController
         if (isset($_REQUEST['company_type'])) {
             $map['company_type'] = $_REQUEST['company_type'];
         }
+        if (isset($_REQUEST['company_belong'])) {
+            $map['company_belong'] = $_REQUEST['company_belong'];
+        }
         
 
         $page = intval(I('get.p', 0));
diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index d70f2f0c3..08799e5cf 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -1326,6 +1326,9 @@ class PromoteController extends ThinkController
         if (strlen(I('company_relation'))) {
             $map['pb.company_relation'] = I('company_relation');
         }
+        if (isset($_REQUEST['company_belong'])) {
+            $map['p.company_belong'] = $_REQUEST['company_belong'];
+        }
 
         if (strlen(I('verify_status'))) {
             $map['verify_status'] = I('verify_status');
diff --git a/Application/Admin/View/Promote/belong.html b/Application/Admin/View/Promote/belong.html
index 7a0db395f..919ceca4d 100644
--- a/Application/Admin/View/Promote/belong.html
+++ b/Application/Admin/View/Promote/belong.html
@@ -74,35 +74,45 @@
                     </volist>
                 </select>
             </div>
-                <div class="input-list input-list-channelstatus">
-                    <select name="company_relation">
-                        <option value="">归属状态</option>
-                        <option value="0">自主开发及维护</option>
-                        <option value="1">只维护</option>
-                    </select>
-                </div>
-                <div class="input-list input-list-channelstatus">
-                    <select name="company_type">
-                        <option value="">工会类型</option>
-                        <option value="1">公司</option>
-                        <option value="2">个人</option>
-                    </select>
-                </div>
-                <div class="input-list input-list-channelstatus">
-                    <select name="verify_status">
-                        <option value="">审核状态</option>
-                        <option value="1">已审核</option>
-                        <option value="0">待审核</option>
-                        <option value="2">审核未通过</option>
-                    </select>
-                </div>
-                <div class="input-list input-list-channelstatus">
-                    <select name="can_view_recharge">
-                        <option value="">充值信息权限</option>
-                        <option value="0">禁止</option>
-                        <option value="1">开放</option>
-                    </select>
-                </div>
+            <div class="input-list input-list-channelstatus">
+                <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>
+            <div class="input-list input-list-channelstatus">
+                <select name="company_relation" class="select_gallery">
+                    <option value="">归属状态</option>
+                    <volist name=":getCompanyRelation()" id="vo">
+                        <option value="{$vo.id}" <php> if($_GET['company_relation'] !='' && $vo['id'] == $_GET['company_relation'])echo selected;</php>>{$vo.name}</option>
+                    </volist>
+                </select>
+            </div>
+            <div class="input-list input-list-channelstatus">
+                <select name="company_type" class="select_gallery">
+                    <option value="">工会类型</option>
+                    <option value="1">公司</option>
+                    <option value="2">个人</option>
+                </select>
+            </div>
+            <div class="input-list input-list-channelstatus">
+                <select name="verify_status" class="select_gallery">
+                    <option value="">审核状态</option>
+                    <option value="1">已审核</option>
+                    <option value="0">待审核</option>
+                    <option value="2">审核未通过</option>
+                </select>
+            </div>
+            <div class="input-list input-list-channelstatus">
+                <select name="can_view_recharge" class="select_gallery">
+                    <option value="">充值信息权限</option>
+                    <option value="0">禁止</option>
+                    <option value="1">开放</option>
+                </select>
+            </div>
+                
             <input type="hidden" name="" value="" class="sortBy">
             <input type="hidden" name="type" value="{$_GET['type']}">
             <div class="input-list">
diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index e5e6d200d..edbecdcb0 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -269,9 +269,9 @@
                                         <else/>
                                         <a href="{:U("Promote/set_status",array('ids'=>$data['id'],"status"=>1,"msg_type"=>12,"field"=>"status"))}" class="ajax-get ">解锁</a>
                                     </if>
-                                    <if condition="session('user_auth.uid') eq 1">
+                                    <!-- <if condition="session('user_auth.uid') eq 1">
                                         <a class='delete' data-id="{$data.id}">删除</a>
-                                    </if>
+                                    </if> -->
                                     <if condition="$data.level = 1">
                                         <a href="{:U('certification', array('id' => $data['id']))}">资质认证</a>
                                     </if>
diff --git a/Application/Admin/View/PromoteCompany/add.html b/Application/Admin/View/PromoteCompany/add.html
index 4a03c7299..6bed89cb6 100644
--- a/Application/Admin/View/PromoteCompany/add.html
+++ b/Application/Admin/View/PromoteCompany/add.html
@@ -111,10 +111,9 @@
                                 <div class="input-list input-list-server search_label_rehab" style="margin:0;">
                                     <select id="company_belong" name="company_belong" class="select_gallery" style="width: 215px;">
                                         <option value="">请选择团体归属</option>
-                                        <option value="0">内团</option>
-                                        <option value="1">外团</option>
-                                        <option value="2">外团-分发</option>
-                                        <option value="3">其他</option>
+                                        <volist name=":getCompanyBlong()" id="vo">
+                                            <option value="{$vo.id}">{$vo.name}</option>
+                                        </volist>
                                     </select>
                                 </div>
                             </td>
diff --git a/Application/Admin/View/PromoteCompany/edit.html b/Application/Admin/View/PromoteCompany/edit.html
index 733136c13..742d7e813 100644
--- a/Application/Admin/View/PromoteCompany/edit.html
+++ b/Application/Admin/View/PromoteCompany/edit.html
@@ -115,14 +115,9 @@
                                 <div class="input-list input-list-server search_label_rehab" style="margin:0;">
                                     <select id="company_belong" name="company_belong" class="select_gallery" style="width: 215px;">
                                         <option value="">请选择团体归属</option>
-                                        <option value="0" <if condition="$data['company_belong'] eq 0">selected
-                                        </if>>内团</option>
-                                        <option value="1" <if condition="$data['company_belong'] eq 1">selected
-                                        </if>>外团</option>
-                                        <option value="2" <if condition="$data['company_belong'] eq 2">selected
-                                        </if>>外团-分发</option>
-                                        <option value="3" <if condition="$data['company_belong'] eq 3">selected
-                                        </if>>其他</option>
+                                        <volist name=":getCompanyBlong()" id="vo">
+                                            <option value="{$vo.id}" <php> if($data['company_belong'] !='' && $vo['id'] == $data['company_belong'])echo selected;</php>>{$vo.name}</option>
+                                        </volist>
                                     </select>
                                 </div>
                             </td>
diff --git a/Application/Admin/View/PromoteCompany/lists.html b/Application/Admin/View/PromoteCompany/lists.html
index 27619bd69..27564e782 100644
--- a/Application/Admin/View/PromoteCompany/lists.html
+++ b/Application/Admin/View/PromoteCompany/lists.html
@@ -65,6 +65,14 @@
                         </volist>
                     </select>
                 </div>
+                <div class="input-list input-list-channelstatus">
+                    <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>
                 <div class="input-list input-list-game search_label_rehab">
                     <select id="company_type" name="company_type" class="select_gallery">
                         <option value="">请选择公司性质</option>