作业布置优化

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupMember.java

@@ -27,6 +27,8 @@ public class ImGroupMember {
 	private Integer memberRankSettingId;
 
 	private String subjectName;
+
+	private String subjectId;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -34,6 +36,14 @@ public class ImGroupMember {
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getSubjectId() {
+		return subjectId;
+	}
+
+	public void setSubjectId(String subjectId) {
+		this.subjectId = subjectId;
+	}
+
 	public Integer getMemberRankSettingId() {
 		return memberRankSettingId;
 	}

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImUserFriend.java

@@ -27,12 +27,22 @@ public class ImUserFriend {
 
 	private String subjectName;
 
+	private String subjectId;
+
 	/**  */
 	private java.util.Date createTime;
 
 	/**  */
 	private java.util.Date updateTime;
 
+	public String getSubjectId() {
+		return subjectId;
+	}
+
+	public void setSubjectId(String subjectId) {
+		this.subjectId = subjectId;
+	}
+
 	public Integer getMemberRankSettingId() {
 		return memberRankSettingId;
 	}

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

@@ -30,6 +30,7 @@
 		<result column="update_time_" property="updateTime" />
 		<result column="member_rank_setting_id_" property="memberRankSettingId" />
 		<result column="subject_name_" property="subjectName" />
+		<result column="subject_id_" property="subjectId" />
 		<result column="username_" property="user.username" />
 		<result column="avatar_" property="user.avatar" />
 	</resultMap>
@@ -133,7 +134,7 @@
 	
 	<select id="queryMemberById" resultMap="ImGroupMemberDto">
 		SELECT igm.*,u.avatar_,CASE WHEN find_in_set('STUDENT',u.user_type_) THEN u.username_ ELSE u.real_name_ END username_,
-		st.member_rank_setting_id_,s.name_ subject_name_
+		st.member_rank_setting_id_,s.name_ subject_name_,st.subject_id_list_ subject_id_
 		FROM im_group_member igm
 		LEFT JOIN sys_user u ON igm.user_id_ = u.id_
 		LEFT JOIN student st ON st.user_id_ = u.id_

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

@@ -15,6 +15,7 @@
 		<result column="tags_" property="tags" />
 		<result column="member_rank_setting_id_" property="memberRankSettingId" />
 		<result column="subject_name_" property="subjectName" />
+		<result column="subject_id_" property="subjectId" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -92,7 +93,7 @@
 	</select>
 	
 	<select id="queryFriendListByUserId" resultMap="ImUserFriendDto" parameterType="map">
-		SELECT iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_,st.member_rank_setting_id_,s.name_ subject_name_
+		SELECT iuf.*,u.real_name_,u.avatar_,u.phone_,u.user_type_,st.member_rank_setting_id_,s.name_ subject_name_,st.subject_id_list_ subject_id_
 		FROM im_user_friend iuf
 		LEFT JOIN sys_user u ON iuf.friend_id_ = u.id_
 		LEFT JOIN student st ON st.user_id_ = u.id_