Merge branch 'feature/0626-live' of http://git.dayaedu.com/yonge/mec into feature/0626-live

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/ImUserFriendDto.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.ImUserFriend;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.Objects;
 import java.util.Optional;
@@ -42,11 +43,14 @@ public class ImUserFriendDto extends ImUserFriend {
 	}
 
 	public String getImFriendId() {
-		return String.valueOf(getFriendId());
+		if (StringUtils.isBlank(imFriendId) && Objects.nonNull(getFriend())) {
+			return String.valueOf(getFriendId());
+		}
+		return Optional.ofNullable(imFriendId).orElse("");
 	}
 
 	public String getFriendAvatar() {
-		if (Objects.nonNull(getFriend())) {
+		if (StringUtils.isBlank(friendAvatar) && Objects.nonNull(getFriend())) {
 			return getFriend().getAvatar();
 		}
 		return Optional.ofNullable(friendAvatar).orElse("");