|
|
@@ -118,7 +118,8 @@ class Topicdongtai extends Api
|
|
|
->join('user','dt.user_id = user.id','LEFT')
|
|
|
->join('user_wallet uw','user.id = uw.user_id','LEFT')
|
|
|
->join('topic_hub th','dt.topic_id = th.id','LEFT')
|
|
|
- ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime')
|
|
|
+ ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
|
|
|
+ ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime,ur.nickname_remark')
|
|
|
->where($where)
|
|
|
->where($where_follow)
|
|
|
->order($orderby)->autopage()->select();
|
|
|
@@ -136,6 +137,7 @@ class Topicdongtai extends Api
|
|
|
$mt_gift_user_dongtai = Db::name('gift_user_dongtai');
|
|
|
|
|
|
foreach ($list as &$val) {
|
|
|
+ $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
|
|
|
$val['name'] = $val['name'] ? : '';
|
|
|
$val['birthday'] = birthtime_to_age($val['birthday']);
|
|
|
$val['createtime'] = get_last_time($val['createtime']);
|
|
|
@@ -191,7 +193,8 @@ class Topicdongtai extends Api
|
|
|
->join('user','dt.user_id = user.id','LEFT')
|
|
|
->join('user_wallet uw','user.id = uw.user_id','LEFT')
|
|
|
->join('topic_hub th','dt.topic_id = th.id','LEFT')
|
|
|
- ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime')
|
|
|
+ ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
|
|
|
+ ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime,ur.nickname_remark')
|
|
|
->where($where)
|
|
|
->order($orderby)->autopage()->select();
|
|
|
$list = list_domain_image($list,['images','avatar']);
|
|
|
@@ -209,6 +212,7 @@ class Topicdongtai extends Api
|
|
|
|
|
|
|
|
|
foreach ($list as &$val) {
|
|
|
+ $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
|
|
|
$val['name'] = $val['name'] ? : '';
|
|
|
$val['birthday'] = birthtime_to_age($val['birthday']);
|
|
|
$val['createtime'] = get_last_time($val['createtime']);
|
|
|
@@ -259,7 +263,8 @@ class Topicdongtai extends Api
|
|
|
->join('user','dt.user_id = user.id','LEFT')
|
|
|
->join('user_wallet uw','user.id = uw.user_id','LEFT')
|
|
|
->join('topic_hub th','dt.topic_id = th.id','LEFT')
|
|
|
- ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime')
|
|
|
+ ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
|
|
|
+ ->field('dt.*,user.nickname,user.avatar,user.gender,user.birthday,user.idcard_status,user.real_status,user.is_hideaddress,th.name,uw.vip_endtime,ur.nickname_remark')
|
|
|
->where('dt.id',$id)->find();
|
|
|
if (!$info) {
|
|
|
$this->error('您的网络开小差啦~');
|
|
|
@@ -269,6 +274,7 @@ class Topicdongtai extends Api
|
|
|
}
|
|
|
|
|
|
$info = info_domain_image($info,['images','avatar']);
|
|
|
+ $info['nickname'] = !empty($info['nickname_remark']) ? $info['nickname_remark'] : $info['nickname'];
|
|
|
$info['name'] = $info['name'] ? : '';
|
|
|
$info['birthday'] = birthtime_to_age($info['birthday']);
|
|
|
$info['createtime'] = get_last_time($info['createtime']);
|
|
|
@@ -491,8 +497,9 @@ class Topicdongtai extends Api
|
|
|
//楼
|
|
|
$floor_list = Db::name('topic_dongtai_answer')
|
|
|
->alias('a')
|
|
|
- ->field('a.*,user.nickname,user.avatar,user.gender,user.birthday')
|
|
|
+ ->field('a.*,user.nickname,user.avatar,user.gender,user.birthday,ur.nickname_remark')
|
|
|
->join('user','a.user_id = user.id','LEFT')
|
|
|
+ ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
|
|
|
->where(['a.dt_id'=>$dt_id,'a.level'=>1])->order('a.id desc')->autopage()->select();
|
|
|
$floor_list = list_domain_image($floor_list,['avatar']);
|
|
|
|
|
|
@@ -511,13 +518,18 @@ class Topicdongtai extends Api
|
|
|
if($number > 0){
|
|
|
$answer_info = Db::name('topic_dongtai_answer')
|
|
|
->alias('a')
|
|
|
- ->field('user.nickname')
|
|
|
+ ->field('user.nickname,ur.nickname_remark')
|
|
|
->join('user','a.user_id = user.id','LEFT')
|
|
|
+ ->join('user_remark ur', 'ur.to_user_id = user.id and ur.user_id = '.$this->auth->id, 'LEFT')
|
|
|
->where($map)->order('a.id desc')->find();
|
|
|
|
|
|
+ $answer_info['nickname'] = !empty($answer_info['nickname_remark']) ? $answer_info['nickname_remark'] : $answer_info['nickname'];
|
|
|
+
|
|
|
$val['childremark'] = $answer_info['nickname'].'...等人,共'.$number.'条回复';
|
|
|
}
|
|
|
|
|
|
+ $val['nickname'] = !empty($val['nickname_remark']) ? $val['nickname_remark'] : $val['nickname'];
|
|
|
+
|
|
|
//时间处理
|
|
|
$val['createtime'] = get_last_time($val['createtime']);
|
|
|
|
lizhen_gitee