github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-07 14:17:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复获取聊天列表的接口

Browse Source
This commit is contained in:
weifashi 2023-06-06 14:25:34 +08:00
parent 11e30d5860
commit 3a13b8bf30
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Http/Controllers/Api/SystemController.php
View File

@ -1251,7 +1251,7 @@ class SystemController extends AbstractController
}) })
->toArray(); ->toArray();
// 用户列表 // 用户列表
$notUserIds = array(); $notUserIds = [$user->userid];
foreach($chatList as $chat){ foreach($chatList as $chat){
if($chat['type'] == 'user'){ if($chat['type'] == 'user'){
$notUserIds[] = $chat['dialog_user']['userid']; $notUserIds[] = $chat['dialog_user']['userid'];
@ -1259,12 +1259,13 @@ class SystemController extends AbstractController
} }
$userList = User::select('userid','email','nickname','userimg') $userList = User::select('userid','email','nickname','userimg')
->where('bot',0) ->where('bot',0)
->where('userid','not in',$notUserIds) ->where('changepass',0)
->whereNull('disable_at')
->whereNotIn('userid',$notUserIds)
->get() ->get()
->transform(function (User $item) { ->transform(function (User $item) {
if(!$item->avatar){ $item->name = $item->nickname;
$item->avatar = 'avatar/'.($item->nickname ?: $item->email).'.png'; $item->avatar = $item->userimg;
}
return $item; return $item;
}) })
->toArray(); ->toArray();