合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !462

@@ -58,6 +58,7 @@ class AdminIndexController extends AdminBaseController
     {
         $where   = ['user_type'=>2];
         $where1=[];
+        $where3=[];
         $param = input('request.');
 
 
@@ -82,12 +83,12 @@ class AdminIndexController extends AdminBaseController
         $uid = (isset($param['uid'])) ? $param['uid'] : null;
         //下级人员
         if($uid) {
-            $where['parent_id'] = ['eq', $uid];
+            $where3['parent_id'] = ['eq', $uid];
         }
 
         $usersQuery = Db::name('user');
 
-        $list = $usersQuery->whereOr($keywordComplex)->where($where)->where($where1)->order("create_time DESC")->paginate(10);
+        $list = $usersQuery->whereOr($keywordComplex)->where($where)->where($where1)->where($where3)->order("create_time DESC")->paginate(10);
         // 获取分页显示
         $list->appends($param);
         $this->assign('start_time', isset($param['start_time']) ? $param['start_time'] : '');