内容库代码兼容
This commit is contained in:
@@ -415,7 +415,7 @@ class ContentLibraryController extends Controller
|
||||
|
||||
// 关键词搜索
|
||||
if (!empty($keyword)) {
|
||||
$where[] = ['content', 'like', '%' . $keyword . '%'];
|
||||
$where[] = ['content|title', 'like', '%' . $keyword . '%'];
|
||||
}
|
||||
|
||||
// 查询数据
|
||||
@@ -440,22 +440,22 @@ class ContentLibraryController extends Controller
|
||||
}
|
||||
|
||||
// 获取发送者信息
|
||||
if ($item['type'] == 'moment' && $item['friendId']) {
|
||||
if ($item['type'] == 'moment' && !empty($item['friendId'])) {
|
||||
$friendInfo = Db::name('wechat_friendship')
|
||||
->alias('wf')
|
||||
->join('wechat_account wa', 'wf.wechatId = wa.wechatId')
|
||||
->where('wf.id', $item['friendId'])
|
||||
->field('wa.nickname, wa.avatar')
|
||||
->find();
|
||||
$item['senderNickname'] = $friendInfo['nickname'] ?: '';
|
||||
$item['senderAvatar'] = $friendInfo['avatar'] ?: '';
|
||||
}else if ($item['type'] == 'group_message' && $item['wechatChatroomId']) {
|
||||
$item['senderNickname'] = !empty($friendInfo['nickname']) ? $friendInfo['nickname'] : '';
|
||||
$item['senderAvatar'] = !empty( $friendInfo['avatar']) ? $friendInfo['avatar'] : '';
|
||||
}else if ($item['type'] == 'group_message' && !empty($item['wechatChatroomId'])) {
|
||||
$friendInfo = Db::table('s2_wechat_chatroom_member')
|
||||
->field('nickname, avatar')
|
||||
->where('wechatId', $item['wechatId'])
|
||||
->find();
|
||||
$item['senderNickname'] = $friendInfo['nickname'] ?: '';
|
||||
$item['senderAvatar'] = $friendInfo['avatar'] ?: '';
|
||||
$item['senderNickname'] = !empty($friendInfo['nickname']) ? $friendInfo['nickname'] : '';
|
||||
$item['senderAvatar'] = !empty($friendInfo['avatar']) ? $friendInfo['avatar'] : '';
|
||||
}
|
||||
}
|
||||
unset($item);
|
||||
|
||||
Reference in New Issue
Block a user