1

app/model/api/User.php

@@ -325,18 +325,24 @@ class User extends BaseModel
                 ->select();
             if (!empty($data)) {
                 $data = $data->toArray();
+                $infoAuditDb = new InfoAudit();
                 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]['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 ServiceType())->where('id', 'in', $projectIds)->select()->toArray();
+                    $item = [
+                        "name" => "",
+                        "avatar" => "",
+                        "age" => "",
+                        "service_project_ar" => [],
+                        "user_work_type_title" => "",
+                        "service_area_all" => [],
+                        "birthday" => ""
+                    ];
+                    $infoData = $infoAuditDb->getItem(["status" => 1, "uid" => $v["uid"]]);
+                    if (!empty($infoData)) {
+                        foreach ($item as $k2 => $v2) {
+                            $item[$k2] = $infoData[$k2];
+                        }
                     }
-                    $data[$k]['user_work_type_title'] = '';
-                    $data[$k]['service_area_all'] = [];
+                    $data[$k] = array_merge($v, $item);
                 }
             }
         }
@@ -575,18 +581,24 @@ class User extends BaseModel
                 ->select();
             if (!empty($data)) {
                 $data = $data->toArray();
+                $infoAuditDb = new InfoAudit();
                 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]['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 ServiceType())->where('id', 'in', $projectIds)->select()->toArray();
+                    $item = [
+                        "name" => "",
+                        "avatar" => "",
+                        "age" => "",
+                        "service_project_ar" => [],
+                        "user_work_type_title" => "",
+                        "service_area_all" => [],
+                        "birthday" => ""
+                    ];
+                    $infoData = $infoAuditDb->getItem(["status" => 1, "uid" => $v["uid"]]);
+                    if (!empty($infoData)) {
+                        foreach ($item as $k2 => $v2) {
+                            $item[$k2] = $infoData[$k2];
+                        }
                     }
-                    $data[$k]['user_work_type_title'] = '';
-                    $data[$k]['service_area_all'] = [];
+                    $data[$k] = array_merge($v, $item);
                 }
             }
         }