From 878414aeb2108e0b8c6be9adaa9b6c4de726b0bc Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 29 Apr 2020 13:52:41 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TestResourceController.class.php          | 16 ++++++-
 .../View/TestResource/supportNumberList.html  | 47 +++++++++++++++++--
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php
index f9d1fde7a..6a22b9c3d 100644
--- a/Application/Admin/Controller/TestResourceController.class.php
+++ b/Application/Admin/Controller/TestResourceController.class.php
@@ -78,8 +78,18 @@ class TestResourceController extends ThinkController
       if(!empty(I('user_account'))){
           $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
       }
-      if(!empty(I('promote_name'))){
-          $map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
+      if(!empty(I('promote_id'))){
+
+          $promote_id = I('promote_id');
+
+          $promnote_arr = M("promote","tab_")->field("id")->where("chain like '%/{$promote_id}/%'")->select();
+
+          $promnote_arr  = array_column($promnote_arr,"id");
+          array_push($promnote_arr,$promote_id);
+
+          $promnote_arr = implode(",",$promnote_arr);
+
+          $map['tab_test_resource.promote_id']=['in',$promnote_arr];
       }
       //为数据权限添加
       setPowerPromoteIds($map, 'tab_test_resource.promote_id');
@@ -91,6 +101,8 @@ class TestResourceController extends ThinkController
           ->order('tab_test_resource.create_time DESC')
           ->select();
 
+//      var_dump($data);die();
+
       foreach ($data as $key => $value) {
           $data[$key]['create_time'] = date('Y-m-d H:i:s',$value['create_time']);
       }
diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html
index 341c8abf6..98ddc53c2 100644
--- a/Application/Admin/View/TestResource/supportNumberList.html
+++ b/Application/Admin/View/TestResource/supportNumberList.html
@@ -74,10 +74,27 @@
 
         <input type="text"  name="user_account" placeholder="测试账号" class="" value="{:I('user_account')}"/>&nbsp;
       </div>
-      <div class="input-list">
-
-        <input type="text"  name="promote_name" placeholder="所属推广员" class="" value="{:I('promote_name')}"/>&nbsp;
+<!--      <div class="input-list">-->
+
+<!--        <input type="text"  name="promote_name" placeholder="所属推广员" class="" value="{:I('promote_name')}"/>&nbsp;-->
+<!--      </div>-->
+
+      <div class="input-list search_item input-list-gamenoticestatus">
+        <select name="promote_level" style="color:#444" class="select_gallery" id="promote_level">
+          <option value="">请选择推广员等级</option>
+          <option value="1" <?php if ($_POST['promote_level'] == 1):?>selected<?php endif;?>>会长</option>
+          <option value="2" <?php if ($_POST['promote_level'] == 2):?>selected<?php endif;?>>部门长</option>
+          <option value="3" <?php if ($_POST['promote_level'] == 3):?>selected<?php endif;?>>组长</option>
+          <option value="4" <?php if ($_POST['promote_level'] == 4):?>selected<?php endif;?>>组员</option>
+        </select>
+        -
       </div>
+      <div class="input-list search_item input-list-gamenoticestatus">
+        <select name="promote_id" style="color:#444" class="select_gallery" id="promote_id">
+          <option value="">请选择推广员</option>
+        </select>
+      </div>
+
       </empty>
       <input type="hidden" name="" value="" class="sortBy">
       <input type="hidden" name="type" value="{$_GET['type']}">
@@ -200,6 +217,7 @@
   <script type="text/javascript">
     //导航高亮
     highlight_subnav('{:U('testResource/supportNumberList')}');
+    $(".select_gallery").select2();
     $(function(){
 
       $('.froze-btn').on({
@@ -221,6 +239,29 @@
         }
       })
 
+
+      var promote_id = "{:I('promote_id')}";
+      $("#promote_level").change(function(){
+        $.ajax({
+          url:"{:U('Ajax/getPromotersByLevelOther')}",
+          type:"get",
+          data:{level:$("#promote_level option:selected").val()},
+          dataType:'json',
+          success:function(response){
+            str = '<option value="">请选择推广员</option>' +
+              // '<option value="0"'+(promote_id && 0 == promote_id?'selected':'')+'>官方渠道</option>' +
+              '';
+            data = response.data;
+            for (var i in data){
+              str += "<option value='"+data[i].id+"' "+(promote_id && data[i].id == promote_id?'selected':'')+">"+data[i].nickname+"</option>"
+            }
+            $("#promote_id").empty();
+            $("#promote_id").append(str);
+            $("#promote_id").select2();
+          }
+        })
+      });
+      $("#promote_level").change();
       $('#batch_freeze').click(function () {
         var ids = $('.ids:checked');
 

From 132b601f7453246f0301f7a4cd93db3f7159e8a8 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Wed, 29 Apr 2020 15:12:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/AjaxController.class.php | 11 ++++++++
 .../TestResourceController.class.php          |  7 +++++-
 .../Admin/Model/PromoteModel.class.php        | 25 +++++++++++++++++++
 .../View/TestResource/supportNumberList.html  |  2 +-
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Application/Admin/Controller/AjaxController.class.php b/Application/Admin/Controller/AjaxController.class.php
index c438a2f3f..f579f16c6 100644
--- a/Application/Admin/Controller/AjaxController.class.php
+++ b/Application/Admin/Controller/AjaxController.class.php
@@ -587,4 +587,15 @@ class AjaxController extends ThinkController{
         $result = M('promote', 'tab_')->field("id,account,nickname")->where(['parent_id'=>$pid])->select();
         $this->ajaxReturn(['code'=>1, 'data'=>$result]);
     }
+
+    public function getPromotersByLevelResource()
+    {
+        $level = I('level');
+        if (!$level) {
+//            return $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>[]]);
+            $level = '';
+        }
+        $this->ajaxReturn(['code'=>1, 'msg'=>'获取成功', 'data'=>(new PromoteModel)->getPromotersByLevelResource($level)]);
+    }
+
 }
\ No newline at end of file
diff --git a/Application/Admin/Controller/TestResourceController.class.php b/Application/Admin/Controller/TestResourceController.class.php
index 6a22b9c3d..b2ee6593b 100644
--- a/Application/Admin/Controller/TestResourceController.class.php
+++ b/Application/Admin/Controller/TestResourceController.class.php
@@ -78,7 +78,7 @@ class TestResourceController extends ThinkController
       if(!empty(I('user_account'))){
           $map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
       }
-      if(!empty(I('promote_id'))){
+      if(!empty(I('promote_id')) || I('promote_id')=="0"){
 
           $promote_id = I('promote_id');
 
@@ -90,6 +90,11 @@ class TestResourceController extends ThinkController
           $promnote_arr = implode(",",$promnote_arr);
 
           $map['tab_test_resource.promote_id']=['in',$promnote_arr];
+
+          if (!I("promote_level")) {
+              $map['tab_test_resource.promote_id']=I('promote_id');
+          }
+
       }
       //为数据权限添加
       setPowerPromoteIds($map, 'tab_test_resource.promote_id');
diff --git a/Application/Admin/Model/PromoteModel.class.php b/Application/Admin/Model/PromoteModel.class.php
index 6b80b7179..b5d1d781f 100644
--- a/Application/Admin/Model/PromoteModel.class.php
+++ b/Application/Admin/Model/PromoteModel.class.php
@@ -450,5 +450,30 @@ class PromoteModel extends Model{
         
     }
 
+    public function getPromotersByLevelResource($level)
+    {
+
+        if ($level) {
+            $where['level'] =  $level;
+        }
+
+        $userAuth = session('user_auth');
+        setPowerPromoteIds($where,'id');
+
+        $offcialData = [0=>['id'=>0,'nickname'=>'官方渠道']];
+
+        $result = $this->field("*")->where($where)->select();
+        foreach ($result as &$item) {
+            $item['nickname'] = $item['account'] . ($item['nickname'] ? "({$item['nickname']})" : "");
+        }
+
+        if ((in_array('0',explode(',',$where['id'][1]))||$userAuth['data_empower_type']==1)) {
+            $result = array_merge($offcialData,$result);
+//            dump($result);die();
+        }
+
+        return $result;
+    }
+
 
 }
\ No newline at end of file
diff --git a/Application/Admin/View/TestResource/supportNumberList.html b/Application/Admin/View/TestResource/supportNumberList.html
index 98ddc53c2..41934642b 100644
--- a/Application/Admin/View/TestResource/supportNumberList.html
+++ b/Application/Admin/View/TestResource/supportNumberList.html
@@ -243,7 +243,7 @@
       var promote_id = "{:I('promote_id')}";
       $("#promote_level").change(function(){
         $.ajax({
-          url:"{:U('Ajax/getPromotersByLevelOther')}",
+          url:"{:U('Ajax/getPromotersByLevelResource')}",
           type:"get",
           data:{level:$("#promote_level option:selected").val()},
           dataType:'json',