Merge remote-tracking branch 'origin/test_future_wangge' into test_future_w...

huanghongfa

2021-05-28 8ee3531169978ab1acf0b8bfb12ec22b3d828a56

 springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventGridDataServiceImpl.java

@@ -101,4 +101,17 @@
        return R.fail();
    }

    @Override
    public R getUserGrid(PageEventGridDataDTO pageEventGridDataDTO) {
        Page page = new Page(1,10);
        if(pageEventGridDataDTO.getPageNum()!=null) {
            page.setCurrent(pageEventGridDataDTO.getPageNum());
        }
        if(pageEventGridDataDTO.getPageSize()!=null) {
            page.setSize(pageEventGridDataDTO.getPageSize());
        }

        return R.ok(eventGridDataMapper.selectUserGrid(page, pageEventGridDataDTO));
    }

}