--no commit message

com.zrqx.talk/src/main/java/com/zrqx/talk/fg/service/FgTalkServiceImpl.java

@@ -19,6 +19,7 @@ import com.zrqx.core.model.talk.Talk;
 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.member.MemberListVO;
 import com.zrqx.core.vo.talk.StatisticVO;
 import com.zrqx.talk.commons.Redis;
 import com.zrqx.talk.fg.client.member.MemberInfoClient;
@@ -116,7 +117,6 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 	 */
 	@Override
 	public PageInfo<Talk> selectRecord(PageParam pageParam, Integer memberId) {
-		PageInfo<Talk> pageInfo = new PageInfo<Talk>();
 		startPage(pageParam);
 		List<Talk> talkList = talkMapper.selectRecord(memberId);
 		for (Talk talk : talkList) {
@@ -125,8 +125,7 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 			List<Imgs> imgsList = fgImgsMapper.select(imgs);
 			talk.setImgPathList(imgsList);
 		}
-		pageInfo.setList(talkList);
-		return pageInfo;
+		return new PageInfo<Talk>(talkList);
 	}
 
 	/**
@@ -147,7 +146,6 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 		} else {
 			m = memberId;
 		}
-		PageInfo<Attention> pageInfo = new PageInfo<Attention>();
 		startPage(pageParam);
 		List<Attention> attentionList = attentionMapper.selectAttion(m);
 		for (Attention attention : attentionList) {
@@ -155,8 +153,7 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 			attention.setImg(member.getImg());
 			attention.setNickName(member.getNickName());
 		}
-		pageInfo.setList(attentionList);
-		return pageInfo;
+		return new PageInfo<Attention>(attentionList);
 	}
 
 	/**
@@ -176,7 +173,6 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 		} else {
 			m = memberId;
 		}
-		PageInfo<Attention> pageInfo = new PageInfo<Attention>();
 		startPage(pageParam);
 		List<Attention> attentionList = attentionMapper.selectFan(m);
 		for (Attention attention : attentionList) {
@@ -184,8 +180,7 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 			attention.setImg(member.getImg());
 			attention.setNickName(member.getNickName());
 		}
-		pageInfo.setList(attentionList);
-		return pageInfo;
+		return new PageInfo<Attention>(attentionList);
 	}
 
 	/**
@@ -199,7 +194,6 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 	 */
 	@Override
 	public PageInfo<Talk> selectPublish(PageParam pageParam, Integer memberId) {
-		PageInfo<Talk> pageInfo = new PageInfo<Talk>();
 		startPage(pageParam);
 		Integer m = null;
 		if (memberId == null) {
@@ -216,8 +210,7 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 			List<Imgs> imgsList = fgImgsMapper.select(imgs);
 			talks.setImgPathList(imgsList);
 		}
-		pageInfo.setList(talkList);
-		return pageInfo;
+		return new PageInfo<Talk>(talkList);
 	}
 
 	/**
@@ -393,7 +386,6 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 	 */
 	@Override
 	public PageInfo<Talk> selectReply(PageParam pageParam, Integer memberId) {
-		PageInfo<Talk> pageInfo = new PageInfo<Talk>();
 		startPage(pageParam);
 		Integer m = null;
 		if (memberId == null) {
@@ -408,8 +400,7 @@ public class FgTalkServiceImpl extends BaseServiceImpl<Talk, Integer> implements
 			List<Imgs> imgsList = fgImgsMapper.select(imgs);
 			talks.setImgPathList(imgsList);
 		}
-		pageInfo.setList(talkList);
-		return pageInfo;
+		return new PageInfo<Talk>(talkList);
 	}
 
 	@Override