|
|
@@ -234,9 +234,9 @@ class User extends BaseModel
|
|
|
$isRegion=$config['sysInfo']['ipregion'] ?? 0;
|
|
|
$auto_cs_uid = getAutoCsUid();//获取机器人ID
|
|
|
foreach ($list_chart as $k => $v) {
|
|
|
- $lastSendTime = $list_chart[$k]['lastSendTime'] * 1000;//time() * 1000;
|
|
|
+ $lastSendTime = $list_chart[$k]['lastSendTime'];
|
|
|
$is_auto = $v['role'] == 0 && $v['cs_uid'] == $auto_cs_uid ? 1 : 0; //挂在机器人名下的用户
|
|
|
- if ($is_auto == 1 && $lasMsgList < time() - 7*24*60*60) {
|
|
|
+ if ($is_auto == 1 && $lastSendTime < time() - 7*24*60*60) {
|
|
|
unset($list_chart[$k]);//过滤一周前的用户
|
|
|
}
|
|
|
// 是否有消息通知或者置顶聊天
|
|
|
@@ -247,7 +247,7 @@ class User extends BaseModel
|
|
|
$list_chart[$k]['avatar'] = avatarUrl($v['avatar'], $v['realname'], $v['user_id'], 120);
|
|
|
$list_chart[$k]['lastContent'] = '';
|
|
|
$list_chart[$k]['unread'] = 0;
|
|
|
- $list_chart[$k]['lastSendTime'] = $lastSendTime;
|
|
|
+ $list_chart[$k]['lastSendTime'] = $lastSendTime * 1000;
|
|
|
$list_chart[$k]['is_group'] = 0;
|
|
|
$list_chart[$k]['setting'] = [];
|
|
|
$list_chart[$k]['is_at'] = 0;
|
|
|
@@ -255,6 +255,7 @@ class User extends BaseModel
|
|
|
$list_chart[$k]['location'] ="";
|
|
|
$list_chart[$k]['cs_uid'] = $v['cs_uid'];
|
|
|
$list_chart[$k]['is_auto'] = $is_auto;
|
|
|
+ $list_chart[$k]['role'] = $v['role'];
|
|
|
$list_chart[$k]['service_status'] = $v['service_status'];
|
|
|
$list_chart[$k]['language_code'] = $v['language_code'];
|
|
|
if($isRegion){
|
lip