|
|
@@ -476,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,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,a.name,a.avatar,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);
|
|
|
@@ -509,7 +509,8 @@ class User extends BaseModel
|
|
|
foreach ($data as $k => $v) {
|
|
|
$data[$k]['name'] = $v['name'] ?? '';
|
|
|
$data[$k]['avatar'] = $v['avatar'] ?? '';
|
|
|
- $data[$k]['age'] = $v['age'] ?? '';
|
|
|
+ // age 通过 birthday 计算得出
|
|
|
+ $data[$k]['age'] = !empty($v['birthday']) ? (intval(date('Y')) - intval(date('Y', $v['birthday']))) : '';
|
|
|
$data[$k]['birthday'] = !empty($v['birthday']) ? date('Y-m-d', $v['birthday']) : '';
|
|
|
$data[$k]['longitude'] = $v['longitude'] ?? 0;
|
|
|
$data[$k]['latitude'] = $v['latitude'] ?? 0;
|
