|
@@ -240,6 +240,16 @@ class User extends BaseModel
|
|
|
unset($list_chart[$k]);//过滤一周前的用户
|
|
unset($list_chart[$k]);//过滤一周前的用户
|
|
|
continue;
|
|
continue;
|
|
|
}
|
|
}
|
|
|
|
|
+ $lastSendTime = $list_chart[$k]['lastSendTime'];
|
|
|
|
|
+ if ($is_auto && $lastSendTime == 0) {
|
|
|
|
|
+ $map1 = [['to_user', '=', $auto_cs_uid], ['is_last', '=', 1], ['is_group', '=', 0]];
|
|
|
|
|
+ $map2 = [['from_user', '=', $auto_cs_uid], ['is_last', '=', 1], ['is_group', '=', 0]];
|
|
|
|
|
+ $lastSendTime = Db::name('message')
|
|
|
|
|
+ ->field($msgField)
|
|
|
|
|
+ ->whereOr([$map1, $map2])
|
|
|
|
|
+ ->order('create_time desc')
|
|
|
|
|
+ ->value('create_time');
|
|
|
|
|
+ }
|
|
|
// 是否有消息通知或者置顶聊天
|
|
// 是否有消息通知或者置顶聊天
|
|
|
$friend = isset($friendList[$v['user_id']]) ? $friendList[$v['user_id']] : [];
|
|
$friend = isset($friendList[$v['user_id']]) ? $friendList[$v['user_id']] : [];
|
|
|
$list_chart[$k]['id'] = $v['user_id'];
|
|
$list_chart[$k]['id'] = $v['user_id'];
|
|
@@ -248,7 +258,7 @@ class User extends BaseModel
|
|
|
$list_chart[$k]['avatar'] = avatarUrl($v['avatar'], $v['realname'], $v['user_id'], 120);
|
|
$list_chart[$k]['avatar'] = avatarUrl($v['avatar'], $v['realname'], $v['user_id'], 120);
|
|
|
$list_chart[$k]['lastContent'] = '';
|
|
$list_chart[$k]['lastContent'] = '';
|
|
|
$list_chart[$k]['unread'] = 0;
|
|
$list_chart[$k]['unread'] = 0;
|
|
|
- $list_chart[$k]['lastSendTime'] = $list_chart[$k]['lastSendTime'] * 1000;
|
|
|
|
|
|
|
+ $list_chart[$k]['lastSendTime'] = $lastSendTime * 1000;
|
|
|
$list_chart[$k]['offline_time'] = date('Y-m-d H:i:s', $v['offline_time']);
|
|
$list_chart[$k]['offline_time'] = date('Y-m-d H:i:s', $v['offline_time']);
|
|
|
$list_chart[$k]['is_group'] = 0;
|
|
$list_chart[$k]['is_group'] = 0;
|
|
|
$list_chart[$k]['setting'] = [];
|
|
$list_chart[$k]['setting'] = [];
|