2023-5-22-1 新增服务区-2

app/api/controller/User.php

@@ -128,26 +128,14 @@ class User extends BaseController
         $time = $request->param('time');
         $times = $request->param('times');
         $users = (new UserModel())
-            ->where('parent_uid', '<>', 0)
+//            ->where('parent_uid', '<>', 0)
             ->where('regtime', '>=', $time)
             ->where('regtime', '<=', $times)
             ->field('parent_uid as uid, count(*) as invite_count')
             ->group('parent_uid')
             ->order('invite_count', 'desc')
             ->select();
-
-        $users2 = (new UserModel())
-            ->where('parent_uid',  0)
-            ->where('regtime', '>=', $time)
-            ->where('regtime', '<=', $times)
-            ->field('parent_uid as uid, count(*) as invite_count')
-            ->group('parent_uid')
-            ->order('uid', 'desc')
-            ->select();
-
         $rankList = [];
-        $rankList2 = [];
-
         foreach ($users as $key => $value) {
             $userInfo = (new UserModel)->where('uid', $value['uid'])->find();
             $auth = (new InfoAudit)->where('uid', $value['uid'])->find();
@@ -164,40 +152,15 @@ class User extends BaseController
                 'user_work_type_id' => $user_work_type_title['title'],
             ];
         }
-        foreach ($users2 as $key2 => $value2) {
-            $userInfo2 = (new UserModel)->where('uid', $value2['uid'])->find();
-            $auth2 = (new InfoAudit)->where('uid', $value2['uid'])->find();
-            $user_work_type_title2 = (new UserWorkType)->where('id', $auth['user_work_type_id'])->find();
-            $rankList2[] = [
-                'rank' => $key2 + 1,
-                'uid' => $value2['uid'],
-                'nickname' => $userInfo2['nickname'],
-                'avatar' => $userInfo2['avatar'],
-                'invite_count' => $value2['invite_count'],
-                'is_type_audit' => $auth && $auth['status'] == 1 ? 1 : 0,
-                'ancestral_place' => $auth2 ? $auth2['ancestral_place'] : '',
-                'auth_info' => $auth ? $auth->toArray() : [],
-                'user_work_type_id' => $user_work_type_title2['title'],
-            ];
-        }
-
         $rankList = array_values(array_filter($rankList, function ($item) {
             return !empty($item['ancestral_place']);
         }));
-        $rankList2 = array_values(array_filter($rankList2, function ($item) {
-            return !empty($item['ancestral_place']);
-        }));
 
         $inviteCount = array_column($rankList, 'invite_count');
         $uid = array_column($rankList, 'uid');
         array_multisort($inviteCount, SORT_DESC, $uid, SORT_ASC, $rankList);
 
-        $inviteCount2 = array_column($rankList2, 'invite_count');
-        $uid2 = array_column($rankList2, 'uid');
-        array_multisort($inviteCount2, SORT_DESC, $uid2, SORT_ASC, $rankList2);
-
         $data['list'] = $rankList;
-        $data['list2'] = $users2;
 
         return app('json')->success($data);
     }