合并分支 'li' 到 'master'

赠送积分和角色管理



查看合并请求 !627

@@ -80,10 +80,10 @@ class AdminIndexController extends AdminBaseController
             $where1['balance'] = ['elt', $param['max']];
         }
 
-        $uid = (isset($param['uid'])) ? $param['uid'] : null;
+        $p_id = (isset($param['uid'])) ? $param['uid'] : null;
         //下级人员
-        if ($uid) {
-            $where3['parent_id'] = ['eq', $uid];
+        if ($p_id) {
+            $where3['parent_id'] = ['eq', $p_id];
         }
 
         $usersQuery = Db::name('user');
@@ -143,7 +143,7 @@ class AdminIndexController extends AdminBaseController
         $this->assign('keyword', isset($param['keyword']) ? $param['keyword'] : '');
         $this->assign('list', $list->items());
         $this->assign('page', $list->render());
-        $this->assign('uid', $uid);
+        $this->assign('uid', $p_id);
         // 渲染模板输出
         return $this->fetch();
     }