--no commit message

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/member/MemberServiceImpl.java

@@ -181,7 +181,7 @@ public class MemberServiceImpl extends BaseModelServiceImpl<Member,Integer> impl
 		}
 		BeanUtils.copy(form, Member.class);
 		memberMapper.updateByPrimaryKey(form);
-		// TODO 根据用户id 删除用户与角色关系
+		//根据用户id 删除用户与角色关系
 		RoleMemberRelation rr = new RoleMemberRelation();
 		rr.setMemberId(form.getId());
 		roleMemberRelationMapper.delete(rr);

com.zrqx.bg.member/src/main/java/com/zrqx/bg/member/service/message/MessageRecordServiceImpl.java

@@ -113,20 +113,24 @@ public class MessageRecordServiceImpl extends BaseServiceImpl<MessageRecord,Inte
 			}else if(entity.getType().equals(MessageRecordTypeEnum.GROUP.getCode())){
 				//会员组
 				List<Member> mList = new ArrayList<Member>();
+				// TODO grouptype类型 逗号 拆分， 循环判断
+				// TODO 获取符合条件的会员id集合
+				// TODO 保存 站内信与会员关系表
 				//出版社会员
 				if(entity.getGroupType().equals(MessageRecordGroupTypeEnum.PRESSMEMBER.getCode())){
 					Example example = new Example(Member.class);
 					example.createCriteria().andEqualTo("type", MemberTypeEnum.PUBLISHER.getCode());
-					mList = memberMapper.selectByExample(example);
+					mList.addAll(memberMapper.selectByExample(example));
 				}
 				//学校会员
 				if(entity.getGroupType().equals(MessageRecordGroupTypeEnum.SCHOOLMEMBER.getCode())){
 					Example example = new Example(Member.class);
 					example.createCriteria().andEqualTo("type", MemberTypeEnum.SCHOOL.getCode());
-					mList = memberMapper.selectByExample(example);
+					mList.addAll(memberMapper.selectByExample(example));
 				}
 				//技校联盟会员会员
 				if(entity.getGroupType().equals(MessageRecordGroupTypeEnum.TECHNICALSCHOOL.getCode())){
+					// TODO select m.* from  school s, member m where  s.id = m.relationid and 学校用户  and 绩效联盟
 					List<Member> list = null;
 					Example example = new Example(Member.class);
 					example.createCriteria().andEqualTo("type", MemberTypeEnum.SCHOOL.getCode());
@@ -142,6 +146,7 @@ public class MessageRecordServiceImpl extends BaseServiceImpl<MessageRecord,Inte
 				}
 				//校长联盟会员
 				if(entity.getGroupType().equals(MessageRecordGroupTypeEnum.PRINCIPAL.getCode())){
+					// TODO select m.* from  school s, member m where  s.id = m.relationid and 学校用户  and 绩效联盟
 					List<Member> list = null;
 					Example example = new Example(Member.class);
 					example.createCriteria().andEqualTo("type", MemberTypeEnum.SCHOOL.getCode());