群聊清空还存在未读消息处理2

app/enterprise/model/Group.php

@@ -16,7 +16,7 @@ class Group extends BaseModel
    public static function getMyGroup($map){
       return Db::name('group_user')
       ->alias('gu')
-      ->field('gr.group_id,gr.avatar,gr.name as displayName,gu.unread,gr.name_py,gr.owner_id,gr.notice,gu.role,gu.is_notice,gu.is_top,gr.setting,gu.create_time as gu_create_time')
+      ->field('gr.group_id,gr.avatar,gr.name as displayName,gu.unread,gr.name_py,gr.owner_id,gr.notice,gu.role,gu.is_notice,gu.is_top,gr.setting,gu.invite_id,gu.create_time as gu_create_time')
       ->join('group gr','gu.group_id=gr.group_id','left')
       ->where($map)
       ->select();

app/enterprise/model/User.php

@@ -195,9 +195,10 @@ class User extends BaseModel
             $group[$k]['is_online'] = 1;
             $group[$k]['is_at'] = 0;
             if ($getGroupLastMsg) {
+               $is_new_group_user = true;
                foreach ($getGroupLastMsg as $key=>$val) {
-                  if ($val['lastSendTime'] < $v['gu_create_time']) {
+                  if ($val['lastSendTime'] > $v['gu_create_time']) {
-                      continue;
+                      $is_new_group_user = false;
                   }
                   if ($val['to_user'] == $v['group_id']) {
                      $group[$k]['type'] =$val['type'];
@@ -208,6 +209,10 @@ class User extends BaseModel
                      break;
                   }
                }
+               if ($is_new_group_user) {
+                   $inviteUser = Friend::getFriendName($user_id,$v['invite_id']);
+                   $group[$k]['lastContent'] = lang('group.invite',['username'=>$inviteUser['nickname']]);
+               }
             }
             if($getAtMsg){
                foreach ($getAtMsg as $key=> $val) {