时间标签的添加

cloud-model/src/main/java/com/hssx/cloudmodel/controller/CompanyController.java

@@ -76,7 +76,7 @@ public class CompanyController {
     @RequestMapping("/list")
     @ResponseBody
     public HttpRespMsg deleteRole(@RequestParam(required = false)String keyName, HttpServletRequest request,
-                                  HttpServletResponse response, @RequestParam(required = false)PageUtil page,@RequestParam(required = false)Integer companyType) {
+                                  HttpServletResponse response, PageUtil page,@RequestParam(required = false)Integer companyType) {
         HttpRespMsg msg = new HttpRespMsg();
         msg = companyService.pageList(page,keyName,companyType);
         return msg;

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/CompanyServiceImpl.java

@@ -95,17 +95,18 @@ public class CompanyServiceImpl extends ServiceImpl<CompanyMapper, Company> impl
     public HttpRespMsg pageList(PageUtil page, String keyName,Integer companyType) {
         HttpRespMsg msg = new HttpRespMsg();
         List<CompanyVO> list = new ArrayList<>();
-
+        System.out.println(page);
         Integer start = (page.getPageNum() - 1) * page.getPageSize();
-        page.setPages(page.getTotal());
         if(companyType == 0){
             list = companyMapper.getListByKeyName(keyName, start, page.getPageSize(),companyType);
             Integer count = list.size();
             page.setTotal(count);
+            page.setPages(page.getTotal());
         }else{
             list = companyMapper.getCustomerListByKeyName(keyName, start, page.getPageSize(),companyType);
             Integer count = list.size();
             page.setTotal(count);
+            page.setPages(page.getTotal());
         }
         page.setList(list);
         msg.data = page;