bug

@@ -20,6 +20,8 @@ use think\Session;
 class OrderSalesmanController extends WeChatBaseController
 class OrderSalesmanController extends WeChatBaseController
 {
 {
     protected $user_id;
     protected $user_id;
+    protected $status;
+    protected $pid;
     protected $beforeActionList = [
     protected $beforeActionList = [
         'check'             => ['except' => 'getGradeClass'],
         'check'             => ['except' => 'getGradeClass'],
     ];
     ];
@@ -31,9 +33,12 @@ class OrderSalesmanController extends WeChatBaseController
         if(empty($my_user)){
         if(empty($my_user)){
             $this->error('查无此人','','','');
             $this->error('查无此人','','','');
         }
         }
-        if($my_user['status'] != 2){
-            $this->error('您还不是业务员那','','','');
+        $this->status = $my_user['status'];
+        $this->pid = $my_user['id'];
+        if($my_user['status'] != 2 && $my_user['status'] != 3){
+            $this->error('您还没有权限查看','','','');
         }
         }
+        $this->assign('my_user',$my_user);
     }
     }
     public function get_all(){
     public function get_all(){
         $param = $this->request->param();
         $param = $this->request->param();
@@ -41,7 +46,17 @@ class OrderSalesmanController extends WeChatBaseController
             $where['is_courier'] = ['eq',$param['is_courier']];
             $where['is_courier'] = ['eq',$param['is_courier']];
         }
         }
         $user_id = $this->user_id;
         $user_id = $this->user_id;
+        if($this->status == 2){
             $where['salesman_uid'] = ['eq',$user_id];
             $where['salesman_uid'] = ['eq',$user_id];
+        }else{
+            //获取当前用户的所有下级
+            $user_child = Db::name('my_user')->where(['pid'=>$this->pid])->select();
+            $user_ids = [];
+            foreach($user_child as $key => $u_c){
+                $user_ids[] = $u_c['uid'];
+            }
+            $where['uid'] = ['in',$user_ids];
+        }
         $where['indent_type'] = ['eq',2];
         $where['indent_type'] = ['eq',2];
         $where['state'] = ['eq',2];
         $where['state'] = ['eq',2];
         $indentModel = new IndentModel();
         $indentModel = new IndentModel();

@@ -225,6 +225,21 @@
                 </div>
                 </div>
             </div>
             </div>
         </a>
         </a>
+        <a href="{:url('OrderSalesman/get_all')}">
+            <div class="log_one_list_one">
+                <div class="log_one_list_left">
+                    <div class="log_one_list_img">
+                        <img src="__TMPL__/public/assets/images/dingdan.png" alt="" />
+                    </div>
+                    <div class="log_one_list_word">
+                        订单管理
+                    </div>
+                </div>
+                <div class="log_one_list_right">
+                    <img src="__TMPL__/public/assets/images/29.png" alt="" />
+                </div>
+            </div>
+        </a>
     </if>
     </if>
 </div>
 </div>
 <!-- 底部一级导航 -->
 <!-- 底部一级导航 -->

@@ -204,13 +204,13 @@ class WeChatBaseController extends BaseController
      */
      */
     public function checkWeChatUserLogin()
     public function checkWeChatUserLogin()
     {
     {
-//        if(cmf_get_current_user_id()==3){
-//            $user = Db::name('user')->where('id',7)->find();
-//            cmf_update_current_user($user);
-//        }else if(cmf_get_current_user_id()==484){
-//            $user = Db::name('user')->where('id',9)->find();
-//            cmf_update_current_user($user);
-//        }
+        if(cmf_get_current_user_id()==3){
+            $user = Db::name('user')->where('id',484)->find();
+            cmf_update_current_user($user);
+        }else if(cmf_get_current_user_id()==484){
+            $user = Db::name('user')->where('id',9)->find();
+            cmf_update_current_user($user);
+        }
 //        session('user',null);
 //        session('user',null);
         $userId = cmf_get_current_user_id();
         $userId = cmf_get_current_user_id();
         if (empty($userId)) {
         if (empty($userId)) {