Merge branch 'dev' into pre

zhongzheng-api/src/main/java/com/zhongzheng/controller/user/UserMockSubscribeController.java

@@ -130,11 +130,19 @@ public class UserMockSubscribeController extends BaseController {
     public TableDataInfo<UserMockSubscribeVo> listSubscribe(UserMockSubscribeQueryBo bo) {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
+        Integer pageNum = 0;
+        Integer pageSize = 0;
+        if (Validator.isNotEmpty(bo.getPageNum()) && Validator.isNotEmpty(bo.getPageSize())) {
+            pageNum = bo.getPageNum();
+            pageSize = bo.getPageSize();
+            bo.setPageNum(null);
+            bo.setPageSize(null);
+        }
         List<UserMockSubscribeVo> list = iUserMockSubscribeService.listSubscribe(bo);
         if (Validator.isEmpty(bo.getPageNum()) || Validator.isEmpty(bo.getPageSize())) {
             return getDataTable(list);
         }
-        return getDataTable(getPageInfo(bo.getPageNum(), bo.getPageSize(), list).getList());
+        return getDataTable(getPageInfo(pageNum, pageSize, list).getList());
     }
 
     /**