--no commit message

com.zrqx.talk/src/main/java/com/zrqx/talk/fg/controller/FgReplyController.java

@@ -79,17 +79,18 @@ public class FgReplyController {
 	@ApiOperation(value = "查询二级", notes = "根据一级ID查询二级回复列表")
 	@GetMapping(value = TalkRequestPath.REPLYLIST2)
 	public CallBack<Reply> getReplyList2(
-			@ApiParam(value = "ID", required = true) @RequestParam Integer oid) {
+			@ApiParam(value = "ID", required = true) @RequestParam Integer oid,
+			PageParam pageParam) {
 		Reply reply = replyService.selectByPrimaryKey(oid);
 		Example example = replyService.createExample();
 		example.orderBy("createDate").desc();
-		Criteria cr = example.createCriteria();
-		cr.andEqualTo("parentId", oid);
-		cr.andEqualTo("hierarchy", 2);
-		cr.andEqualTo("status", 1);
-		List<Reply> replyList = replyService.selectByCriteria();
-		reply.setReplyList(replyList);
-		for (Reply reply2 : replyList) {
+		Reply nreply = new Reply();
+		nreply.setStatus(1);
+		nreply.setParentId(oid);
+		nreply.setHierarchy(2);
+		PageInfo<Reply> pr = replyService.query(nreply, pageParam);
+		reply.setReplyList(pr);
+		for (Reply reply2 : pr.getList()) {
 			ThumbsUp tu = new ThumbsUp();
 			tu.setMemberId(redis.getMember().getId());
 			tu.setType(2);