|
|
@@ -685,12 +685,13 @@ class Forum extends Base
|
|
|
if ($title = input('get.title')) $sel_where[] = ['f.title|f.label', 'like', '%' . $title . '%'];
|
|
|
$list = UserForum::where($sel_where)
|
|
|
->alias('f')
|
|
|
- ->field('f.id,f.title,f.content,f.level,f.label,f.browse_num,f.create_at,u.name,u.headimg, IFNULL( (SELECT count(r.id) FROM dd_forum_reply as r WHERE f.id=r.forum_id ),0 ) as reply_num')
|
|
|
+ ->field('f.id,f.content title,f.content,f.level,f.label,f.browse_num,f.create_at,u.name,u.headimg, IFNULL( (SELECT count(r.id) FROM dd_forum_reply as r WHERE f.id=r.forum_id ),0 ) as reply_num')
|
|
|
->leftJoin('store_member u', 'u.id = f.user_id')
|
|
|
->limit($this->off_set, $this->page_num)
|
|
|
->order('id desc')
|
|
|
->select()->toArray();
|
|
|
array_walk($list,function (&$v){
|
|
|
+ $v['title'] = strip_tags($v['title']);
|
|
|
$v['browse_num'] = numTransform($v['browse_num']);
|
|
|
$v['reply_num'] = numTransform($v['reply_num']);
|
|
|
$v['label_name'] = $v['label'] ? explode(',', trim($v['label'], ',')) : null;
|
|
|
@@ -1136,9 +1137,13 @@ class Forum extends Base
|
|
|
$sel_where[] = ['t.user_id','<>',$this->user_id];
|
|
|
$sel_where[] = ['t.pid', 'in', implode(',', $all_comment)];
|
|
|
$sel_where[] = ['t.reply_id',$type == 1 ? '=' : '>',0];
|
|
|
+ $field = 't.id,t.is_top,t.create_at,t.is_read,t.content,t.is_deleted,t.pid,forum_id,u.name user_name,u.headimg,i.title,t.reply_id,i.level';
|
|
|
+ if($type == 1){
|
|
|
+ $field = 't.id,t.is_top,t.create_at,t.is_read,t.content,t.is_deleted,t.pid,forum_id,u.name user_name,u.headimg,i.content title,t.reply_id,i.level';
|
|
|
+ }
|
|
|
$list = ForumReplyComment::where($sel_where)
|
|
|
->alias('t')
|
|
|
- ->field('t.id,t.is_top,t.create_at,t.is_read,t.content,t.is_deleted,t.pid,forum_id,u.name user_name,u.headimg,i.title,t.reply_id,i.level')
|
|
|
+ ->field($field)
|
|
|
->leftJoin('store_member u', 't.user_id = u.id')
|
|
|
->leftJoin('UserForum i', 't.forum_id = i.id')
|
|
|
->order('t.is_top desc,t.id desc')
|
|
|
@@ -1161,6 +1166,7 @@ class Forum extends Base
|
|
|
$parent_comment['show_title'] = $parent_comment['show_title'];
|
|
|
}
|
|
|
$v['parent_comment'] = $parent_comment;
|
|
|
+ $v['title'] = strip_tags($v['title']);
|
|
|
}
|
|
|
$total_num = ForumReplyComment::where($sel_where)->alias('t')->leftJoin('store_member u', 't.user_id = u.id')
|
|
|
->leftJoin('UserForum i', 't.forum_id = i.id')->count();
|
|
|
@@ -1274,7 +1280,7 @@ class Forum extends Base
|
|
|
$sel_where[] = ['p.user_id', '<>', $this->user_id];
|
|
|
$sel_where[] = ['p.to_deleted', '=', 0];
|
|
|
$list = PlatformLike::where($sel_where)
|
|
|
- ->field('p.*,f.title,u.name user_name,u.headimg,f.level')
|
|
|
+ ->field('p.*,f.content title,u.name user_name,u.headimg,f.level')
|
|
|
->alias('p')
|
|
|
->leftJoin('UserForum f', 'f.id = p.like_id')
|
|
|
->leftJoin('StoreMember u', 'u.id = p.user_id')
|
|
|
@@ -1282,6 +1288,7 @@ class Forum extends Base
|
|
|
->select()->toArray();
|
|
|
array_walk($list, function (&$v) {
|
|
|
$v['is_normal'] = CheckPower::checkModulesPower($v['like_id'], 0, $this->request->controller());
|
|
|
+ $v['title'] = strip_tags($v['title']);
|
|
|
});
|
|
|
$total_num = PlatformLike::where($sel_where)->alias('p')
|
|
|
->leftJoin('UserForum f', 'f.id = p.like_id')->leftJoin('StoreMember u', 'u.id = p.user_id')->count();
|
