合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !460

@@ -48,15 +48,10 @@ class UserController extends AdminBaseController
         /**搜索条件**/
         /**搜索条件**/
         $user_login = $this->request->param('user_login');
         $user_login = $this->request->param('user_login');
         $user_email = trim($this->request->param('user_email'));
         $user_email = trim($this->request->param('user_email'));
-        echo $uid = $this->request->param('uid');exit();
         if ($user_login) {
         if ($user_login) {
             $where['user_login'] = ['like', "%$user_login%"];
             $where['user_login'] = ['like', "%$user_login%"];
         }
         }
 
 
-        //下级人员
-        if($uid) {
-            $where['parent_id'] = ['eq', $uid];
-        }
 
 
         $users = Db::name('user')
         $users = Db::name('user')
             ->where($where)
             ->where($where)

@@ -78,6 +78,13 @@ class AdminIndexController extends AdminBaseController
         if (!empty($param['max'])){
         if (!empty($param['max'])){
             $where1['balance']=['elt',$param['max']];
             $where1['balance']=['elt',$param['max']];
         }
         }
+
+        $uid = $param['uid'];
+        //下级人员
+        if($uid) {
+            $where['parent_id'] = ['eq', $uid];
+        }
+
         $usersQuery = Db::name('user');
         $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)->order("create_time DESC")->paginate(10);