Merge branch 'master' into pre

components/message.vue

@@ -326,8 +326,15 @@
                 return true;
             }
 
-            const o = +this.messageBody.eid;
-            return o === +this.chatMyId;
+            if (this.messageBody.eid && this.chatMyId) {
+                const o = +this.messageBody.eid;
+                const m1 = o === +this.chatMyId;
+                if (m1 && Xim.isBackend() && this.messageBody.oid) {
+                    return +this.messageBody.oid === +Xim.getOrgId();
+                }
+                return m1;
+            }
+            return false;
         }
 
         private get userName() {