Merge branch 'refs/heads/feature-im'

dao/im.go

@@ -291,7 +291,7 @@ func FindGroupUsers(group_id int) []GroupUser {
 }
 func FindGroupUsersInfo(group_id int) []FriendRet {
 	var groupUsers []FriendRet
-	DB.Debug().Raw("select distinct users.id, users.name, users.email from users join group_users on users.id = group_users.user_id where group_users.group_id = ?", group_id).Scan(&groupUsers)
+	DB.Debug().Raw("select distinct users.id, users.name, users.email from users join group_users on users.id = group_users.user_id where group_users.group_id = ? and group_users.deleted_at is null", group_id).Scan(&groupUsers)
 	return groupUsers
 }