WIN-2308041133\Administrator 2 дней назад
Родитель
Сommit
1ffe9c936e
1 измененных файлов с 28 добавлено и 24 удалено
  1. 28 24
      app/model/api/User.php

+ 28 - 24
app/model/api/User.php

@@ -490,22 +490,24 @@ class User extends BaseModel
             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;
-                    }
-                }
+                // /* 注释掉 service_project_ar 查询 start */
+                // // 一次性获取所有 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;
+                //     }
+                // }
+                // /* 注释掉 service_project_ar 查询 end */
                 
                 foreach ($data as $k => $v) {
                     $data[$k]['name'] = $v['name'] ?? '';
@@ -516,14 +518,16 @@ class User extends BaseModel
                     $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']);
-                        foreach ($projectIds as $pid) {
-                            if (isset($projectMap[$pid])) {
-                                $data[$k]['service_project_ar'][] = $projectMap[$pid];
-                            }
-                        }
-                    }
+                    // /* 注释掉 service_project 匹配逻辑 start */
+                    // if (!empty($v['service_project'])) {
+                    //     $projectIds = is_array($v['service_project']) ? $v['service_project'] : explode(',', $v['service_project']);
+                    //     foreach ($projectIds as $pid) {
+                    //         if (isset($projectMap[$pid])) {
+                    //             $data[$k]['service_project_ar'][] = $projectMap[$pid];
+                    //         }
+                    //     }
+                    // }
+                    // /* 注释掉 service_project 匹配逻辑 end */
                     $data[$k]['user_work_type_title'] = '';
                     $data[$k]['service_area_all'] = [];
                 }