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

app/api/controller/User.php

@@ -149,17 +149,28 @@ class User extends BaseController
                 -> toArray();
             foreach ($list as &$v) {
                 $v['count'] = (new UserModel)->where('parent_uid', $v['uid'])->count();
+                $v['auth_info'] = null;
             }
         } else {
             $list = (new UserModel)
-                ->alias('u')
-                ->where('u.parent_uid', 'in', $uids)
-                ->group('u.parent_uid')
-                ->field('u.parent_uid AS uid, COUNT(*) AS count, u.nickname, u.avatar')
+                ->where('parent_uid', 'in', $uids)
+                ->join('info_audit', 'user.uid = info_audit.uid', 'LEFT')
+                ->group('parent_uid')
+                ->field('parent_uid AS uid, COUNT(*) AS count, info_audit.user_work_type_id, info_audit.ancestral_place, info_audit.status')
                 ->order('count', 'DESC')
                 ->page($page, $pageSize)
                 ->select()
                 ->toArray();
+            foreach ($list as &$v) {
+                $user = (new UserModel)->where('uid', $v['uid'])->field('nickname, avatar')->find();
+                $v['nickname'] = $user['nickname'];
+                $v['avatar'] = $user['avatar'];
+                $v['auth_info'] = [
+                    'user_work_type_id' => $v['user_work_type_id'],
+                    'ancestral_place' => $v['ancestral_place'],
+                    'status' => $v['status'],
+                ];
+            }
         }
         return app('json')->success(compact('count','list'));
     }