--no commit message

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

@@ -10,23 +10,24 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
+
 import com.zrqx.core.form.member.bg.pm.QueryPrivateMessageForm;
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.model.member.Member;
+import com.zrqx.core.model.member.PersonalMember;
 import com.zrqx.core.model.member.PmMember;
 import com.zrqx.core.model.member.PrivateMessage;
 import com.zrqx.core.service.BaseServiceImpl;
 import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
-import com.zrqx.core.vo.member.bg.pm.PrivateMessageListVO;
 import com.zrqx.core.vo.member.bg.pm.PrivateMessageVO;
 import com.zrqx.member.bg.member.mapper.MemberMapper;
 import com.zrqx.member.bg.omember.mapper.OrganMemberMapper;
 import com.zrqx.member.bg.pm.mapper.PmMemberMapper;
 import com.zrqx.member.bg.pm.mapper.PrivateMessageMapper;
-
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.entity.Example.Criteria;
+import com.zrqx.member.bg.pmember.mapper.PersonalMemberMapper;
 /**
  * 站内信 转
  */
@@ -40,6 +41,8 @@ public class PrivateMessageServiceImpl extends BaseServiceImpl<PrivateMessage, I
 	@Autowired
 	MemberMapper mMapper;
 	@Autowired
+	PersonalMemberMapper personalMemberMapper;
+	@Autowired
 	OrganMemberMapper omMapper;
 	@Override
 	public BaseMapper<PrivateMessage> getMapper() {
@@ -58,10 +61,24 @@ public class PrivateMessageServiceImpl extends BaseServiceImpl<PrivateMessage, I
 				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);
+					List<PersonalMember> personMemberList = personalMemberMapper.selectByExample(example);
+					idsList = personMemberList.stream().map(PersonalMember::getId).collect(Collectors.toList());
+				}
+				if(entity.getMemberGroup() == 1){
+					Example example = new Example(PersonalMember.class);
+					example.createCriteria().andEqualTo("vip", 1).orEqualTo("vip", null);
+					List<PersonalMember> personMemberList = personalMemberMapper.selectByExample(example);
+					idsList = personMemberList.stream().map(PersonalMember::getId).collect(Collectors.toList());
+				}
+				if(entity.getMemberGroup() == 2){
 					Example example = new Example(Member.class);
 					example.createCriteria().andEqualTo("level", entity.getMemberGroup());
 					List<Member> mList = mMapper.selectByExample(example);
 					idsList=mList.stream().map(Member::getId).collect(Collectors.toList());
+				}
 			}else if(entity.getAcceptMember() == 2){
 				//指定会员
 				idsList= entity.getMemberIds();