fnvtk/cunkebao_v3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复内容库及选择好友功能

Browse Source
This commit is contained in:
wong
2025-06-26 09:31:57 +08:00
parent c8ea37ec5e
commit b9879b1cee
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Server/application/cunkebao/controller/ContentLibraryController.php
View File

@@ -877,7 +877,6 @@ class ContentLibraryController extends Controller
->whereIn('id', $friendIds)
->where('isDeleted', 0)
->select();
if (empty($friends)) {
return [
'status' => 'failed',
@@ -902,8 +901,6 @@ class ContentLibraryController extends Controller
}
// 从s2_wechat_moments表获取朋友圈数据
$moments = Db::table('s2_wechat_moments')
->where([
@@ -911,7 +908,7 @@ class ContentLibraryController extends Controller
'wechatAccountId' => $friend['wechatAccountId']
])
->order('createTime', 'desc')
->where('createTime', '>=', time() - 86400)
//->where('create_time', '>=', time() - 86400)
->select();
if (empty($moments)) {

8
Server/application/cunkebao/controller/friend/GetFriendListV1Controller.php
View File

@@ -33,10 +33,10 @@ class GetFriendListV1Controller extends BaseController
$where = [];
if ($this->getUserInfo('isAdmin') == 1) {
$where[] = ['wf.companyId','=',$this->getUserInfo('companyId')];
$where[] = ['dw.companyId','=',$this->getUserInfo('companyId')];
$where[] = ['wf.deleteTime','=',0];
} else {
$where[] = ['wf.companyId','=',$this->getUserInfo('companyId')];
$where[] = ['dw.companyId','=',$this->getUserInfo('companyId')];
$where[] = ['wf.deleteTime','=',0];
//$where[] = ['wf.userId','=',$this->getUserInfo('id')];
}
@@ -56,11 +56,11 @@ class GetFriendListV1Controller extends BaseController
->field(['wa1.nickname','wa1.avatar','wa1.alias','wf.id','wf.wechatId','wa2.nickname as ownerNickname','wa2.alias as ownerAlias','wa2.wechatId as ownerWechatId','wf.createTime'])
->Join('wechat_account wa1','wf.wechatId = wa1.wechatId')
->Join('wechat_account wa2','wf.ownerWechatId = wa2.wechatId')
->join('device_wechat_login dw','wa2.wechatId = dw.wechatId')
->join('device_wechat_login dw','wa2.wechatId = dw.wechatId AND alive = 1')
->where($where);
$total = $data->count();
$list = $data->page($page, $limit)->order('wf.id DESC')->select();
$list = $data->page($page, $limit)->order('wf.id DESC')->group('wf.id')->select();