Merge branch 'feature/1020-tencent-im' into test

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

@@ -4,6 +4,8 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.ImGroupNotice;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.util.Objects;
+
 public class ImGroupNoticeDto extends ImGroupNotice {
 
 	private SysUser user = new SysUser();
@@ -18,6 +20,9 @@ public class ImGroupNoticeDto extends ImGroupNotice {
 	@ApiModelProperty(value = "是否发送给新人")
 	private Boolean sentToNewMemberFlag;
 
+	@ApiModelProperty("用户名称")
+	private String username;
+
 	public SysUser getUser() {
 		return user;
 	}
@@ -38,4 +43,14 @@ public class ImGroupNoticeDto extends ImGroupNotice {
 		return isIsSentToNewMember();
 	}
 
+	public String getUsername() {
+		if (Objects.nonNull(getUser())) {
+			return getUser().getRealName();
+		}
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
 }

mec-biz/src/main/resources/config/mybatis/ImGroupNoticeMapper.xml

@@ -22,6 +22,7 @@
 	
 	<resultMap type="com.ym.mec.biz.dal.dto.ImGroupNoticeDto" id="ImGroupNoticeDto" extends="ImGroupNotice">
 		<result column="real_name_" property="user.realName"/>
+		<result column="username_" property="user.username"/>
         <result column="avatar_" property="user.avatar"/>
 	</resultMap>
 	
@@ -76,7 +77,8 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryForPage" resultMap="ImGroupNoticeDto" parameterType="map">
-		SELECT ign.*,if(u.real_name_ is null or u.real_name_ = '',u.username_,u.real_name_) as real_name_,u.avatar_ FROM im_group_notice ign left join sys_user u on ign.operator_id_ = u.id_
+		SELECT ign.*,if(u.real_name_ is null or u.real_name_ = '',u.username_,u.real_name_) as real_name_, u.username_, u.avatar_
+		FROM im_group_notice ign left join sys_user u on ign.operator_id_ = u.id_
 		<where>
             ign.del_flag_ = 0 and ign.tenant_id_ = #{tenantId}
             <if test="groupId != null">