diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index a40c1dcd9..b4f362db4 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -5392,10 +5392,14 @@ if ($key == 'model'){
             if ($root_id == '0') {
                 $map['_string'] = "promote_id = {$root_id}";
             } else if($root_id){
-                $map['_string'] = "promote_id = {$root_id} or parent_id = {$root_id} or root_id = {$root_id}";
+                $map['_string'] = "promote_id = {$root_id} or chain like '%/{$root_id}/%'";
             }
         }
 
+        if (!empty(I('root_name'))) {
+            $map['promote_account'] = array('like','%'.I("root_name").'%');
+        }
+
         if (!empty(I("game_id"))) {
             $map['game_id'] = I("game_id");
         }
@@ -5416,7 +5420,7 @@ if ($key == 'model'){
 
         if(!empty(I('parent_id'))) {
             $parent_id = I('parent_id');
-            $map['_string'] = "promote_id = {$parent_id} or parent_id = {$parent_id}";
+            $map['_string'] = "promote_id = {$parent_id} or chain like '%/{$parent_id}/%'";
         }
 
         if (!empty(I('promote_id'))) {
@@ -5677,8 +5681,8 @@ if ($key == 'model'){
             $map['promote_account']=['like','%'.I("root_name").'%'];
         }
 
-        $map['parent_id'] = 0;
-        $map['root_id'] = 0;
+//        $map['chain'] = "/";
+        $map['level'] = ['elt',1];
         $xlsData = M('spend_user_count','tab_')
             ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
@@ -5704,22 +5708,100 @@ if ($key == 'model'){
 
     }
 
-    function exportGetParentUser() {
+    public function exportMiniterUser() {
 
-        //获取所有数据
         if (!empty(I("count_date")) ) {
             $month = I("count_date");
             $map['count_date'] =$month;
+
         }
 
         $parentData = [];
 
         if (!empty(I("root_id"))) {
             $root_id = I("root_id");
+                $parentData = $this->getParentSpendData($root_id,$month,2);
+            $map['chain'] =['like','%'.$root_id.'%'];
+            $map['level'] = 2;
+        } else if(!empty(I("sign"))){
+            $map['parent_id'] = ['neq',0];
+            $map['root_id'] = ['eq',0];
+
+        } else {
+            if (I("root_id") == 0) {
+                $root_id = I("root_id");
+                $map['promote_id'] = $root_id;
+            }
+        }
+
+        if (!empty(I("root_name"))) {
+            $rootname = I("root_name");
+            $map['promote_account'] =['like','%'.$rootname.'%'];
+        }
+
+        $xlsName = '组长月结统计';
+
+        $xlsCell = array(
+            array('promote_account','会长渠道'),
+            array('cash_count','游戏现金流水'),
+            array('balance_coin_count','平台币支出'),
+            array('inside_cash_count','公会内充发放'),
+            array('bind_coin_count','公会内充支出'),
+            array('all_count','总流水'),
+        );
+
+
+        $xlsData = M('spend_user_count','tab_')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
+            ->where($map)
+            ->group('promote_id')
+            ->select();
+        if (empty(I("root_name"))) {
+            $xlsData = array_merge($parentData,$xlsData);
+        }
+
+        $sumData = M('spend_user_count','tab_')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
+            ->where($map)
+            ->find();
+        if (empty(I("root_name"))) {
+            $sumData['cash_count'] = number_format($sumData['cash_count'] + $parentData[0]['cash_count'], 2, '.', '');
+            $sumData['balance_coin_count'] = number_format($sumData['balance_coin_count'] + $parentData[0]['balance_coin_count'], 2, '.', '');
+            $sumData['inside_cash_count'] = number_format($sumData['inside_cash_count'] + $parentData[0]['inside_cash_count'], 2, '.', '');
+            $sumData['all_count'] = number_format($sumData['all_count'] + $parentData[0]['all_count'], 2, '.', '');
+            $sumData['bind_coin_count'] = number_format($sumData['bind_coin_count'] + $parentData[0]['bind_coin_count'], 2, '.', '');
+        }
 
-            $parentData = $this->getParentSpendData($root_id,$month);
 
-            $map['parent_id'] =$root_id;
+        $sumData = [['promote_account'=>'总计',
+            'cash_count'=>$sumData['cash_count'],
+            'balance_coin_count'=>$sumData['balance_coin_count'],
+            'inside_cash_count'=>$sumData['inside_cash_count'],
+            'bind_coin_count'=>$sumData['bind_coin_count'],
+            'all_count'=>$sumData['all_count'],
+        ]];
+        $xlsData = array_merge($xlsData,$sumData);
+
+        $this->exportExcel($xlsName, $xlsCell, $xlsData);
+    }
+
+    function exportGetParentUser() {
+
+        //获取所有数据
+        if (!empty(I("count_date")) ) {
+            $month = I("count_date");
+            $map['count_date'] =$month;
+        }
+
+        $parentData = [];
+
+        if (!empty(I("parent_id"))) {
+            $root_id = I("parent_id");
+
+            $parentData = $this->getParentSpendData($root_id,$month,3);
+
+            $map['chain'] =['like','%'.$root_id.'%'];
+            $map['level'] = 3;
 
         } else if(!empty(I("sign"))){
             $map['parent_id'] = ['neq',0];
@@ -5796,9 +5878,10 @@ if ($key == 'model'){
         $parentData = [];
         if (!empty(I("parent_id"))) {
             $parent_id = I("parent_id");
-            $parentData = $this->getParentSpendData($parent_id,$month);
+            $parentData = $this->getParentSpendData($parent_id,$month,4);
 
-            $map['parent_id'] =$parent_id;
+            $map['chain'] =['like','%'.$parent_id.'%'];
+            $map['level'] = 4;
         }
 
         if (!empty(I('sign'))) {
@@ -5853,7 +5936,7 @@ if ($key == 'model'){
 
     }
 
-    function getParentSpendData($root_id,$date) {
+    function getParentSpendData($root_id,$date,$level=2) {
 
         $data = [];
         if (!$root_id) {
@@ -5870,13 +5953,16 @@ if ($key == 'model'){
             $data = M('spend_user_count','tab_')
                 ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
                 ->where($map)->select();
-
-            $map1['parent_id'] = $data[0]['promote_id'];
+//            dump($data);
+            $map1['chain'] = ['like','%/'.$data[0]['promote_id'].'/%'];
             $map1['count_date'] = $date;
+            $map1['level'] = $level;
             $sunData = M('spend_user_count','tab_')
                 ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
                 ->where($map1)->find();
-
+//            echo M('spend_user_count','tab_')->_sql();
+//            dump($sunData);
+//die();
             $data[0]['cash_count'] = number_format($data[0]['cash_count']-$sunData['cash_count'],2,'.','');
             $data[0]['balance_coin_count'] = number_format($data[0]['balance_coin_count']-$sunData['balance_coin_count'],2,'.','');
             $data[0]['inside_cash_count'] = number_format($data[0]['inside_cash_count']-$sunData['inside_cash_count'],2,'.','');
diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 82e92ea12..2706d8429 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -149,7 +149,8 @@ class FinanceController extends ThinkController
             if ($root_id == '0') {
                 $map['_string'] = "promote_id = {$root_id}";
             } else if($root_id){
-                $map['_string'] = "promote_id = {$root_id} or parent_id = {$root_id} or root_id = {$root_id}";
+                $map['_string'] = "promote_id = {$root_id} or chain like '%/{$root_id}/%'";
+//                $map['_string'] = "promote_id = {$root_id} or parent_id = {$root_id} or root_id = {$root_id}";
             }
         }
 
@@ -171,7 +172,7 @@ class FinanceController extends ThinkController
 
         if(!empty(I('parent_id'))) {
             $parent_id = I('parent_id');
-            $map['_string'] = "promote_id = {$parent_id} or parent_id = {$parent_id}";
+            $map['_string'] = "promote_id = {$parent_id} or chain like '%/{$parent_id}/%'";
         }
 
         if (!empty(I('promote_id'))) {
@@ -333,8 +334,8 @@ class FinanceController extends ThinkController
             $map['promote_account']=['like','%'.I("root_name").'%'];
         }
 
-        $map['parent_id'] = 0;
-        $map['root_id'] = 0;
+//        $map['chain'] = "/";
+        $map['level'] = ['elt',1];
         $subQueryAll = M('spend_user_count','tab_')
             ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
@@ -362,9 +363,8 @@ class FinanceController extends ThinkController
         $this->assign('data',$subQueryAll);
         $this->display();
     }
-    public function getParentUser($p = 1)
-    {
 
+    public function getMiniterUser($p = 1) {
         $page = intval($p);
         $page = $page ? $page : 1; //默认显示第一页数据
         $row=10;
@@ -381,10 +381,10 @@ class FinanceController extends ThinkController
         if (!empty(I("root_id"))) {
             $root_id = I("root_id");
             if ($page == 1) {
-                $parentData = $this->getParentSpendData($root_id,$month);
+                $parentData = $this->getParentSpendData($root_id,$month,2);
             }
-            $map['parent_id'] =$root_id;
-
+            $map['chain'] =['like','%'.$root_id.'%'];
+            $map['level'] = 2;
         } else if(!empty(I("sign"))){
             $map['parent_id'] = ['neq',0];
             $map['root_id'] = ['eq',0];
@@ -402,6 +402,85 @@ class FinanceController extends ThinkController
         }
 
 
+        $subQueryAll = M('spend_user_count','tab_')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
+            ->where($map)
+            ->group('promote_id')
+            ->page($page,$row)
+            ->select();
+        if (empty(I("root_name"))) {
+            $subQueryAll = array_merge($parentData,$subQueryAll);
+        }
+
+        $sumData = M('spend_user_count','tab_')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
+            ->where($map)
+            ->find();
+        if (empty(I("root_name"))) {
+            $sumData['cash_count'] = number_format($sumData['cash_count'] + $parentData[0]['cash_count'], 2, '.', '');
+            $sumData['balance_coin_count'] = number_format($sumData['balance_coin_count'] + $parentData[0]['balance_coin_count'], 2, '.', '');
+            $sumData['inside_cash_count'] = number_format($sumData['inside_cash_count'] + $parentData[0]['inside_cash_count'], 2, '.', '');
+            $sumData['all_count'] = number_format($sumData['all_count'] + $parentData[0]['all_count'], 2, '.', '');
+            $sumData['bind_coin_count'] = number_format($sumData['bind_coin_count'] + $parentData[0]['bind_coin_count'], 2, '.', '');
+        }
+
+        $count = M('spend_user_count','tab_')
+            ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count')
+            ->where($map)
+            ->group('promote_id')
+            ->select();
+
+        $count = count($count);
+        $page = set_pagination($count,$row);
+        if($page) {$this->assign('_page', $page);}
+        $this->meta_title = '组长流水';
+
+        $this->assign('sumData',$sumData);
+        $this->assign('data',$subQueryAll);
+        $this->display();
+    }
+
+    public function getParentUser($p = 1)
+    {
+
+        $page = intval($p);
+        $page = $page ? $page : 1; //默认显示第一页数据
+        $row=10;
+        if(isset($_REQUEST['row'])) {$row = $_REQUEST['row'];}else{$row = 10;}
+
+        if (!empty(I("count_date")) ) {
+            $month = I("count_date");
+            $map['count_date'] =$month;
+
+        }
+
+        $parentData = [];
+
+        if (!empty(I("parent_id"))) {
+            $root_id = I("parent_id");
+            if ($page == 1) {
+                $parentData = $this->getParentSpendData($root_id,$month,3);
+            }
+            $map['chain'] =['like','%'.$root_id.'%'];
+            $map['level'] = 3;
+
+        } else if(!empty(I("sign"))){
+            $map['parent_id'] = ['neq',0];
+            $map['root_id'] = ['eq',0];
+
+        } else {
+            if (I("parent_id") == 0) {
+                $root_id = I("parent_id");
+                $map['promote_id'] = $root_id;
+            }
+        }
+
+        if (!empty(I("root_name"))) {
+            $rootname = I("root_name");
+            $map['promote_account'] =['like','%'.$rootname.'%'];
+        }
+
+
         $subQueryAll = M('spend_user_count','tab_')
             ->field('promote_id,promote_account,sum(cash_count) cash_count,sum(balance_coin_count) balance_coin_count,sum(inside_cash_count) inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
             ->where($map)
@@ -457,10 +536,11 @@ class FinanceController extends ThinkController
             $parent_id = I("parent_id");
 
             if ($page == 1) {
-                $parentData = $this->getParentSpendData($parent_id,$month);
+                $parentData = $this->getParentSpendData($parent_id,$month,4);
             }
 
-            $map['parent_id'] =$parent_id;
+            $map['chain'] =['like','%'.$parent_id.'%'];
+            $map['level'] = 4;
         }
 
         if (!empty(I('sign'))) {
@@ -539,7 +619,7 @@ class FinanceController extends ThinkController
         $this->ajaxReturn($data,'json');
     }
 
-    function getParentSpendData($root_id,$date) {
+    function getParentSpendData($root_id,$date,$level=2) {
 
         $data = [];
         if (!$root_id) {
@@ -556,13 +636,16 @@ class FinanceController extends ThinkController
             $data = M('spend_user_count','tab_')
                 ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
                 ->where($map)->select();
-
-            $map1['parent_id'] = $data[0]['promote_id'];
+//            dump($data);
+            $map1['chain'] = ['like','%/'.$data[0]['promote_id'].'/%'];
             $map1['count_date'] = $date;
+            $map1['level'] = $level;
             $sunData = M('spend_user_count','tab_')
                 ->field('promote_id,promote_account, sum(cash_count) as cash_count,sum(balance_coin_count) as balance_coin_count,sum(inside_cash_count) as inside_cash_count, sum(all_count) as all_count, sum(bind_coin_count) as bind_coin_count')
                 ->where($map1)->find();
-
+//            echo M('spend_user_count','tab_')->_sql();
+//            dump($sunData);
+//die();
             $data[0]['cash_count'] = number_format($data[0]['cash_count']-$sunData['cash_count'],2,'.','');
             $data[0]['balance_coin_count'] = number_format($data[0]['balance_coin_count']-$sunData['balance_coin_count'],2,'.','');
             $data[0]['inside_cash_count'] = number_format($data[0]['inside_cash_count']-$sunData['inside_cash_count'],2,'.','');
diff --git a/Application/Admin/View/Finance/getMiniterUser.html b/Application/Admin/View/Finance/getMiniterUser.html
new file mode 100644
index 000000000..c97fbc25f
--- /dev/null
+++ b/Application/Admin/View/Finance/getMiniterUser.html
@@ -0,0 +1,286 @@
+<extend name="Public/base"/>
+
+<block name="body">
+  <link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
+  <script type="text/javascript" src="__JS__/bootstrap.min.js"></script>
+  <script type="text/javascript" src="__JS__/select2.min.js"></script>
+  <style>
+    .select2-container--default .select2-selection--single {
+      color: #000;
+      resize: none;
+      border-width: 1px;
+      border-style: solid;
+      border-color: #a7b5bc #ced9df #ced9df #a7b5bc;
+      box-shadow: 0px 3px 3px #F7F8F9 inset;height:35px;
+      height:28px;border-radius:3px;font-size:12px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__rendered {
+      line-height:35px;
+      line-height:28px;
+    }
+    .select2-container--default .select2-selection--single .select2-selection__arrow {
+      height:26px;
+    }
+    .select2-container--default .select2-search--dropdown .select2-search__field {
+      height:26px;line-height:26px;font-size:12px;
+    }
+    .select2-results__option[aria-selected] {font-size:12px;}
+
+    .tooltip {
+      position: relative;
+      display: inline-block;
+      color: #056dae;
+    }
+
+    .tooltip .tooltiptext {
+      visibility: hidden;
+      width: 250%;
+      background-color: #fff;
+      color: #fff;
+      text-align: center;
+      border-radius: 6px;
+      padding: 5px 0;
+      position: absolute;
+      z-index: 1;
+      bottom: 80%;
+      left: 0;
+      margin-left: -70%;
+      border: #000 solid 1px;
+    }
+
+    .tooltip .tooltiptext::after {
+      content: "";
+      position: absolute;
+      top: 100%;
+      left: 50%;
+      margin-left: -5px;
+      border-width: 5px;
+      border-style: solid;
+      border-color: black transparent transparent transparent;
+    }
+
+    .tooltip:hover .tooltiptext {
+
+      color: #000;
+      visibility: visible;
+      line-height: 20px;
+    }
+
+  </style>
+
+
+  <div class="cf main-place top_nav_list navtab_list">
+
+    <h3 class="page_title">会长->部长月结统计</h3>
+    <p class="description_text"></p>
+  </div>
+
+  <div class="cf top_nav_list">
+
+    <!-- 高级搜索 -->
+    <div class="jssearch fl cf search_list">
+      <!--游戏类型搜索END-->
+
+      <div class="input-list">
+        <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
+        <a class="sch-btn" href="{:U('Export/exportMiniterUser',
+                array('count_date'=>$_GET['count_date'],'root_name'=>$_GET['root_name'],'root_id'=>$_GET['root_id'],'',false))}" style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+      </div>
+      <input type="hidden" name="root_id" value="{$_GET['root_id']}"/>
+      <input type="hidden" name="count_date" value="{$_GET['count_date']}"/>
+      <div class="input-list">
+
+        <input type="text"  name="root_name" placeholder="请输入组长账号搜索" class="" value="{:I('root_name')}" style="width: 180px"/>&nbsp;
+      </div>
+      <div class="input-list">
+
+        <a class="sch-btn" href="javascript:;" id="search" url="{:U('Finance/getMiniterUser','model='.$model['name'].'&row='.I('row'),false)}"
+           style="">搜索</a>
+      </div>
+    </div>
+  </div>
+
+
+  <!-- 数据列表 -->
+  <div class="data_list">
+    <div class="">
+      <table>
+        <!-- 表头 -->
+        <thead>
+        <tr>
+          <th >部长渠道</th>
+
+          <th><div class="tooltip">游戏现金流水<span class="tooltiptext"><span style="margin-left: -10px">第三方支付（微信，支付宝，快捷）。</span></span></div></th>
+
+          <th ><div class="tooltip">平台币支出<span class="tooltiptext"><span style="margin-left: -10px">平台币所支付的流水</span></span></div></th>
+
+          <th ><div class="tooltip">公会内充发放<span class="tooltiptext"><span style="margin-left: -10px">平台直接下放给公会的平台币</span></span></div></th>
+
+          <th ><div class="tooltip">公会内充支出<span class="tooltiptext"><span style="margin-left: -10px">绑币消耗流水</span></span></div></th>
+
+          <th ><div class="tooltip">总流水<span class="tooltiptext"><span style="margin-left: -10px">游戏现金流水+平台币支出+公会内充支出=总流水</span></span></div></th>
+
+          <th >操作</th>
+
+        </tr>
+        </thead>
+        <!-- 列表 -->
+        <tbody>
+        <style>
+          .data-table thead th, .data-table tbody td{text-align:center}
+          .data-table tbody td{border-right:1px solid #DDDDDD;}
+          .d_list .drop-down ul {z-index:999;}
+        </style>
+        <if condition = "empty($data)">
+          <tr>
+            <td colspan="14" class="text-center">aOh! 暂时还没有内容!</td>
+          </tr>
+        </if>
+        <notemtpy name = "data">
+          <volist name="data" id="data">
+            <tr>
+              <td >{$data.promote_account}</td>
+              <td >{$data.cash_count}</td>
+              <td >{$data.balance_coin_count}</td>
+              <td >{$data.inside_cash_count}</td>
+              <td >{$data.bind_coin_count}</td>
+              <td >{$data.all_count}</td>
+              <td ><if condition="$data['promote_id'] neq $_GET['root_id']">
+                <a href="{:U('Finance/gameFinance',array('sign'=>1,'parent_id'=>$data['promote_id'],'root_id'=>$_GET['root_id'],'count_date'=>$_GET['count_date'],'from'=>'getParentUser'))}" >游戏查看</a>
+                <a href="{:U('Finance/getParentUser',array('count_date'=>$_GET['count_date'],'parent_id'=>$data['promote_id'],'root_id'=>$_GET['root_id'],'root_name'=>$_GET['root_name'],'root_name1'=>$_GET['root_name1']))}" >组长渠道</a>
+              <else/>
+                -------
+              </if></td>
+          </volist>
+          <tr>
+            <td ><span>总计</span></td>
+            <td ><span>{$sumData.cash_count}</span></td>
+            <td ><span>{$sumData.balance_coin_count}</span></td>
+            <td ><span>{$sumData.inside_cash_count}</span></td>
+            <td ><span>{$sumData.bind_coin_count}</span></td>
+            <td ><span>{$sumData.all_count}</span></td>
+            <td >
+              <a href="{:U('Finance/gameFinance',array('sign'=>1,'count_date'=>$_GET['count_date'],'root_id'=>$_GET['root_id'],'parent_id'=>$_GET['root_name']?$data['promote_id']:'','from'=>'getParentUser'))}" >游戏查看</a>
+<!--              <a href="{:U('Finance/getPromoteUser',array('count_date'=>$_GET['count_date'],'root_id'=>$_GET['root_id'],'sign'=>1))}" >渠道查看</a>-->
+            </td>
+          </tr>
+        </notemtpy>
+
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="page">
+
+    {$_page|default=''}
+  </div>
+</block>
+
+<block name="script">
+  <script src="__STATIC__/layer/layer.js" type="text/javascript"></script>
+  <script type="text/javascript" src="__STATIC__/layer/extend/layer.ext.js" ></script>
+  <link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
+  <php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
+  <link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
+  <script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+  <script>
+    <volist name=":I('get.')" id="vo">
+      Think.setValue('{$key}',"{$vo}");
+    </volist>
+  </script>
+  <script type="text/javascript">
+    //导航高亮
+    highlight_subnav('{:U('Finance/index')}');
+    $(function(){
+
+      $('.page a').click(function () {
+        var href = $(this).attr('href');
+        $(this).removeAttr('href');
+        window.location.replace(href)
+        console.log(href)
+      });
+
+
+      //搜索功能
+      $("#search").click(function(){
+        var starttime = $.trim($('#time-start').val());
+        var endtime = $.trim($('#time-end').val());
+
+        if (starttime && endtime && starttime > endtime) {layer.msg('开始时间必须小于等于结束时间');return false;}
+
+
+        var url = $(this).attr('url');
+        var query  = $('.jssearch').find('input').serialize();
+        query  += "&" + $('.jssearch').find('select').serialize();
+        query = query.replace(/(&|^)(\w*?\d*?\-*?_*?)*?=?((?=&)|(?=$))/g,'');
+        query = query.replace(/^&/g,'');
+        if( url.indexOf('?')>0 ){
+          url += '&' + query;
+        }else{
+          url += '?' + query;
+        }
+        window.location.replace(url);
+      });
+
+      //回车自动提交
+      $('.jssearch').find('input').keyup(function(event){
+        if(event.keyCode===13){
+          $("#search").click();
+        }
+      });
+      $(".ljcz").click(function(){
+        var id = $(this).attr('data-value');
+        var game_name = "{:I('game_name')}";
+        var server_name = "{:I('server_id')}";
+        layer.open({
+          type: 2,
+          title: '游戏消费记录',
+          shadeClose: true,
+          shade: 0.8,
+          area: ['70%', '80%'],
+          content: 'admin.php?s=/Platform/chongzhi_detail/promote_id/'+id+'/game_name/'+game_name+'/server_name/'+server_name+''//iframe的url
+        });
+      });
+
+      $("#game_id").change(function(){
+        $.ajax({
+          url:"{:U('Ajax/getSpendServer')}",
+          type:"post",
+          data:{game_id:$("#game_id option:selected").attr('game-id')},
+          dataType:'json',
+          success:function(data){
+            str = "<option value=''>请选择区服</option>";
+            for (var i in data){
+              str += "<option value='"+data[i].server_name+"'>"+data[i].server_name+"</option>"
+            }
+            $("#server_id").empty();
+            $("#server_id").append(str);
+            $("#server_id").select2();
+
+          }
+        })
+      });
+      var game_id = "{:I('game_name')}";
+      var game_server = "{:I('server_id')}";
+      if(game_id){
+        $.ajax({
+          url:"{:U('Ajax/getSpendServer')}",
+          type:"post",
+          data:{game_id:game_id,type:2},
+          dataType:'json',
+          success:function(data){
+            str = "<option value=''>请选择区服</option>";
+            for (var i in data){
+              str += "<option value='"+data[i].server_name+"' "+(game_server && data[i].server_name == game_server?'selected':'')+">"+data[i].server_name+"</option>"
+            }
+            $("#server_id").empty();
+            $("#server_id").append(str);
+            $("#server_id").select2();
+
+          }
+        })
+      }
+    })
+  </script>
+</block>
diff --git a/Application/Admin/View/Finance/getParentUser.html b/Application/Admin/View/Finance/getParentUser.html
index ca0c96f48..353fdff0d 100644
--- a/Application/Admin/View/Finance/getParentUser.html
+++ b/Application/Admin/View/Finance/getParentUser.html
@@ -71,7 +71,7 @@
 
   <div class="cf main-place top_nav_list navtab_list">
 
-    <h3 class="page_title">会长->组长月结统计</h3>
+    <h3 class="page_title">会长->部长->组长月结统计</h3>
     <p class="description_text"></p>
   </div>
 
@@ -84,9 +84,10 @@
       <div class="input-list">
         <a class="sch-btn" href="javascript:history.go(-1)" style="background:#fff;color: #000;border: #000 solid 1px;width: 100px">返回</a>
         <a class="sch-btn" href="{:U('Export/exportGetParentUser',
-                array('count_date'=>$_GET['count_date'],'root_name'=>$_GET['root_name'],'root_id'=>$_GET['root_id'],'',false))}" style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
+                array('count_date'=>$_GET['count_date'],'root_name'=>$_GET['root_name'],'root_id'=>$_GET['root_id'],'parent_id'=>$_GET['parent_id'],'',false))}" style="width: 100px;border: #3C95C8 solid 1px;">导出</a>
       </div>
       <input type="hidden" name="root_id" value="{$_GET['root_id']}"/>
+      <input type="hidden" name="parent_id" value="{$_GET['parent_id']}"/>
       <input type="hidden" name="count_date" value="{$_GET['count_date']}"/>
       <div class="input-list">
 
@@ -145,7 +146,7 @@
               <td >{$data.inside_cash_count}</td>
               <td >{$data.bind_coin_count}</td>
               <td >{$data.all_count}</td>
-              <td ><if condition="$data['promote_id'] neq $_GET['root_id']">
+              <td ><if condition="$data['promote_id'] neq $_GET['parent_id']">
                 <a href="{:U('Finance/gameFinance',array('sign'=>1,'parent_id'=>$data['promote_id'],'root_id'=>$_GET['root_id'],'count_date'=>$_GET['count_date'],'from'=>'getParentUser'))}" >游戏查看</a>
                 <a href="{:U('Finance/getPromoteUser',array('count_date'=>$_GET['count_date'],'parent_id'=>$data['promote_id'],'root_id'=>$_GET['root_id'],'root_name'=>$_GET['root_name'],'root_name1'=>$_GET['root_name1']))}" >推广员渠道</a>
               <else/>
diff --git a/Application/Admin/View/Finance/getPromoteUser.html b/Application/Admin/View/Finance/getPromoteUser.html
index 385bc2a95..9a7c69669 100644
--- a/Application/Admin/View/Finance/getPromoteUser.html
+++ b/Application/Admin/View/Finance/getPromoteUser.html
@@ -70,7 +70,7 @@
 
   <div class="cf main-place top_nav_list navtab_list">
 
-    <h3 class="page_title">会长->组长->推广员月结统计</h3>
+    <h3 class="page_title">会长->部长->组长->推广员月结统计</h3>
     <p class="description_text"></p>
   </div>
 
diff --git a/Application/Admin/View/Finance/getRootUser.html b/Application/Admin/View/Finance/getRootUser.html
index 76862520f..263ffa9c7 100644
--- a/Application/Admin/View/Finance/getRootUser.html
+++ b/Application/Admin/View/Finance/getRootUser.html
@@ -147,7 +147,7 @@
               <td >{$data.bind_coin_count}</td>
               <td >{$data.all_count}</td>
               <td ><a href="{:U('Finance/gameFinance',array('root_id'=>$data['promote_id'],'count_date'=>$_GET['count_date'],'from'=>'getRootUser','sign'=>1))}" >游戏查看</a>
-                <a href="{:U('Finance/getParentUser',array('count_date'=>$_GET['count_date'],'root_id'=>$data['promote_id']))}" >组长渠道</a></td>
+                <a href="{:U('Finance/getMiniterUser',array('count_date'=>$_GET['count_date'],'root_id'=>$data['promote_id']))}" >部长渠道</a></td>
           </volist>
           <tr>
             <td ><span>总计</span></td>