Merge branch 'cherry-pick-89b557fe' into 'release'

修复web端IM聊天的一个bug release

See merge request o2oa/o2oa!4223

(cherry picked from commit f99d5ee5)

ba32fb05 Merge branch 'cherry-pick-4ccd8c46' into 'develop_java8'

o2server/x_message_assemble_communicate/src/main/java/com/x/message/assemble/communicate/jaxrs/im/ActionConversationCreate.java

@@ -83,9 +83,10 @@ public class ActionConversationCreate extends BaseAction {
                 }else {
                     for (int i = 0; i < conversation.getPersonList().size(); i++) {
                         String person = conversation.getPersonList().get(i);
-                        if (i > 3) {
+                        if (i == 3) {
                             title += person.substring(0, person.indexOf("@"));
                             title += "...";
+                            break;
                         }else {
                             title += person.substring(0, person.indexOf("@")) + "、";
                         }

o2web/source/x_component_IMV2/$Main/default/style.css

@@ -145,6 +145,9 @@
     float:left; 
     color: rgb(51, 51, 51); 
     overflow:hidden;
+    max-width: 170px;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 .o2_im_chat_list .item .body_up .body_time {
     float: right; 

o2web/source/x_component_IMV2/Main.js

@@ -883,6 +883,7 @@ MWF.xApplication.IMV2.ConversationItem = new Class({
 	 * @param {*} lastMessage 
 	 */
 	refreshLastMsg: function (lastMessage) {
+		if (lastMessage) {
 			//目前是text 类型的消息
 			var jsonbody = lastMessage.body;
 			var body = JSON.parse(jsonbody);
@@ -907,6 +908,7 @@ MWF.xApplication.IMV2.ConversationItem = new Class({
 			if (this.messageTimeNode) {
 				this.messageTimeNode.set("text", time);
 			}
+		}
 	},
 	// 更新聊天窗口上的标题 修改标题的时候使用 @Disuse 使用refreshData
 	refreshConvTitle: function (title) {