--no commit message

app/member/src/main/java/com/zrqx/member/bg/pm/service/PrivateMessageServiceImpl.java

@@ -64,6 +64,14 @@ public class PrivateMessageServiceImpl extends BaseServiceImpl<PrivateMessage, I
 				List<Member> mList = mMapper.selectAll();
 				idsList=mList.stream().map(Member::getId).collect(Collectors.toList());
 			}else if(entity.getAcceptMember() == 1){
+				//除了会员和机构会员的普通用户
+				if(entity.getMemberGroup() == 0) {
+					Example example = new Example(PersonalMember.class);
+					example.createCriteria().andNotEqualTo("vip", 1).andNotEqualTo("orderType", 1);;
+					List<PersonalMember> mList = personalMemberMapper.selectByExample(example);
+					idsList=mList.stream().map(PersonalMember::getId).collect(Collectors.toList());
+				}
+	
 				//指定vip
 				if(entity.getMemberGroup() == 1) {
 					Example example = new Example(PersonalMember.class);
@@ -71,6 +79,14 @@ public class PrivateMessageServiceImpl extends BaseServiceImpl<PrivateMessage, I
 					List<PersonalMember> mList = personalMemberMapper.selectByExample(example);
 					idsList=mList.stream().map(PersonalMember::getId).collect(Collectors.toList());
 				}
+				//指定机构会员
+				if(entity.getMemberGroup() == 2) {
+					Example example = new Example(PersonalMember.class);
+					example.createCriteria().andEqualTo("orderType", 1);
+					List<PersonalMember> mList = personalMemberMapper.selectByExample(example);
+					idsList=mList.stream().map(PersonalMember::getId).collect(Collectors.toList());
+				}
+				
 				
 			}else if(entity.getAcceptMember() == 2){
 				//指定会员