1

app/api/controller/Pub.php

@@ -327,10 +327,8 @@ class Pub extends BaseController
         $post["status"] = 1;
         $data = (new UserModel)->getNewApiWorkerList($post);
         foreach ($data['list'] as &$item) {
-            $infoAuditDb = new InfoAudit();
-            $infoData = $infoAuditDb->getItem(["status" => 1, "uid" => $item["uid"]]);
             $item['is_type_audit'] = $item['is_type_audit'] == 1 ? 1 : 0;
-            $item['ancestral_place'] = !empty($infoData['ancestral_place']) ? $infoData['ancestral_place'] : '';
+            $item['ancestral_place'] = $item['ancestral_place'] ?? '';
         }
         return app('json')->success($data);
     }

app/model/api/User.php

@@ -274,7 +274,7 @@ class User extends BaseModel
         if ($totalCount > 0) {
             $data = $this
                 ->alias("u")
-                ->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit,IFNULL(u.longitude,0) as longitude,IFNULL(u.latitude,0) as latitude")
+                ->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit")
                 ->leftJoin("info_audit a", "u.uid=a.uid")
                 ->leftJoin("user_show_template ut", "ut.uid  = u.uid and ut.is_default = 1")//默认模板
                 ->where($where)
@@ -290,13 +290,11 @@ class User extends BaseModel
                 $item = [
                     "name" => "",
                     "avatar" => "",
-//                    "age" => "",
+                    "age" => "",
                     "service_project_ar" => [],
                     "user_work_type_title" => "",
                     "service_area_all" => [],
-                    "birthday" => "",
-                    "longitude" => $v['longitude'] ?? 0,
-                    "latitude" => $v['latitude'] ?? 0
+                    "birthday" => ""
                 ];
                 $infoData = $infoAuditDb->getItem(["status" => 1, "uid" => $v["uid"]]);
                 if (!empty($infoData)) {
@@ -317,68 +315,6 @@ class User extends BaseModel
         return ["list" => $data, "pageSize" => $post["pageSize"], "page" => $post["page"], "totalCount" => $totalCount];
     }
 
-//    /**
-//     * 获取小程序在职展示列表
-//     * @return type
-//     */
-//    public function getApiWorkerList($post)
-//    {
-//        $post["pageSize"] = $post["pageSize"] > 50 ? 50 : (int)$post["pageSize"];
-//        $post["page"] = $post["page"] <= 0 ? 1 : (int)$post["page"];
-//        $where = [];
-//        $where[] = ["u.work_type_id", ">", 0];
-//        $where[] = ["u.status", "=", 1];
-//        if (!empty($post['work_type_id'])) {
-//            $where[] = ["u.work_type_id", "=", $post['work_type_id']];
-//        }
-//        $totalCount = $this->alias("u")->where($where)->count();
-//        $data = null;
-//        if ($totalCount > 0) {
-//            $data = $this
-//                ->alias("u")
-//                ->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit,IFNULL(u.longitude,0) as longitude,IFNULL(u.latitude,0) as latitude")
-//                ->leftJoin("info_audit a", "u.uid=a.uid")
-//                ->leftJoin("user_show_template ut", "ut.uid  = u.uid and ut.is_default = 1")//默认模板
-//                ->where($where)
-//                ->order("u.show_temp_seq", "desc")
-//                ->order("u.uid", "desc")
-//                ->page($post["page"], $post["pageSize"])
-//                ->select();
-//            if (!empty($data)) {
-//                $data = $data->toArray();
-//            }
-//            $infoAuditDb = new InfoAudit();
-//            foreach ($data as $k => $v) {
-//                $item = [
-//                    "name" => "",
-//                    "avatar" => "",
-//                    "age" => "",
-//                    "service_project_ar" => [],
-//                    "user_work_type_title" => "",
-//                    "service_area_all" => [],
-//                    "birthday" => "",
-//                    "longitude" => $v['longitude'] ?? 0,
-//                    "latitude" => $v['latitude'] ?? 0
-//                ];
-//                $infoData = $infoAuditDb->getItem(["status" => 1, "uid" => $v["uid"]]);
-//                if (!empty($infoData)) {
-//                    foreach ($item as $k2 => $v2) {
-//                        $item[$k2] = $infoData[$k2];
-//                    }
-//                }
-//                $data[$k] = array_merge($v, $item);
-//            }
-//        }
-////        $datatwo = [];
-////        foreach($data as $v){
-////            if($v['is_show'] == 1){
-////                $datatwo[] = $v;
-////            }
-////        }
-//        $data = empty($data) ? [] : $data;
-//        return ["list" => $data, "pageSize" => $post["pageSize"], "page" => $post["page"], "totalCount" => $totalCount];
-//    }
-
 
     /**
      * 获取小程序在职展示列表
@@ -540,7 +476,7 @@ class User extends BaseModel
         if ($totalCount > 0) {
             $dataModel = $this
                 ->alias("u")
-                ->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit,a.name,a.avatar,a.age,a.birthday,a.service_project")
+                ->field("u.uid,ut.show_template_id,a.ancestral_place,a.status as is_type_audit,a.name,a.avatar,a.age,a.birthday,a.service_project,IFNULL(u.longitude,0) as longitude,IFNULL(u.latitude,0) as latitude")
                 ->leftJoin("info_audit a", "u.uid=a.uid and a.status = 1 and a.is_show = 1")
                 ->leftJoin("user_show_template ut", "ut.uid  = u.uid and ut.is_default = 1")
                 ->where($where);
@@ -552,15 +488,39 @@ class User extends BaseModel
                 ->select();
             if (!empty($data)) {
                 $data = $data->toArray();
+                
+                // 一次性获取所有 service_project 的详情
+                $allProjectIds = [];
+                foreach ($data as $v) {
+                    if (!empty($v['service_project'])) {
+                        $projectIds = is_array($v['service_project']) ? $v['service_project'] : explode(',', $v['service_project']);
+                        $allProjectIds = array_merge($allProjectIds, $projectIds);
+                    }
+                }
+                $projectMap = [];
+                if (!empty($allProjectIds)) {
+                    $allProjectIds = array_unique(array_map('intval', $allProjectIds));
+                    $projectList = (new ServiceTypeModel())->where('id', 'in', $allProjectIds)->select()->toArray();
+                    foreach ($projectList as $p) {
+                        $projectMap[$p['id']] = $p;
+                    }
+                }
+                
                 foreach ($data as $k => $v) {
                     $data[$k]['name'] = $v['name'] ?? '';
                     $data[$k]['avatar'] = $v['avatar'] ?? '';
                     $data[$k]['age'] = $v['age'] ?? '';
                     $data[$k]['birthday'] = !empty($v['birthday']) ? date('Y-m-d', $v['birthday']) : '';
+                    $data[$k]['longitude'] = $v['longitude'] ?? 0;
+                    $data[$k]['latitude'] = $v['latitude'] ?? 0;
                     $data[$k]['service_project_ar'] = [];
                     if (!empty($v['service_project'])) {
                         $projectIds = is_array($v['service_project']) ? $v['service_project'] : explode(',', $v['service_project']);
-                        $data[$k]['service_project_ar'] = (new ServiceTypeModel())->where('id', 'in', $projectIds)->select()->toArray();
+                        foreach ($projectIds as $pid) {
+                            if (isset($projectMap[$pid])) {
+                                $data[$k]['service_project_ar'][] = $projectMap[$pid];
+                            }
+                        }
                     }
                     $data[$k]['user_work_type_title'] = '';
                     $data[$k]['service_area_all'] = [];