Default Changelist

app/api/controller/User.php

@@ -109,46 +109,14 @@ class User extends BaseController
             ['page', 1],
             ['pageSize', 50],
         ], $request);
-
-        $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
-        $post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
-
-        $post["parent_uid"] = $request->user["uid"];
-
-        $data = (new UserModel)->getDataList($post, "u.uid,u.mobile,u.nickname,u.avatar");
-
-        $rankNum = $request->input('rankNum', 50); // 排行榜显示个数，默认为50
-        $rankType = $request->input('rankType', 2); // 排行榜分类方式，默认为总邀请人数
-
-        // 生成总邀请人数的排行榜
-        $rankList = [];
-        $userList = (new UserModel)->where('parent_uid', $request->user["uid"])->select('uid', 'nickname')->get();
-        foreach ($userList as $user) {
-            $count = $this->getTotalInvites($user->uid);
-            $rankList[] = [
-                'uid' => $user->uid,
-                'nickname' => $user->nickname,
-                'count' => $count,
-            ];
-        }
-
-        if ($rankType == 1) {
-            usort($rankList, function ($a, $b) {
-                return $b['count'] - $a['count'];
-            });
-        } else {
-            usort($rankList, function ($a, $b) {
-                return strtotime($a['created_at']) - strtotime($b['created_at']);
-            });
-        }
-
-        // 返回排行榜数据
-        $rankList = array_slice($rankList, 0, $rankNum);
-        $data['rankList'] = $rankList;
-
+        $post["pageSize"]  = $post["pageSize"]>50 ? 50 : (int)$post["pageSize"];
+        $post["page"]      = $post["page"]<=0     ? 1  : (int)$post["page"];
+        $post["parent_uid"]= $request->user["uid"];
+        $data = (new UserModel)->getDataList($post,"u.uid,u.mobile,u.nickname,u.avatar");
         return app('json')->success($data);
     }
 
+
     /**
      * 设置用户信息
      * @param Request $request

app/model/api/User.php

@@ -269,7 +269,7 @@ class User extends BaseModel
         if($totalCount>0){
             $data = $this
                 ->alias("u")
-                ->field("u.uid,ut.show_template_id,u.is_type_audit,u.ancestral_place")
+                ->field("u.uid,ut.show_template_id")
                 ->leftJoin("user_show_template ut", "ut.uid  = u.uid and ut.is_default = 1")//默认模板
                 ->where($where)
                 ->order("u.show_temp_seq", "desc")