diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java index 705b456..a1a88f0 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java @@ -1,6 +1,7 @@ package com.hisense.hiatmp.server_api.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.hisense.hiatmp.model.common.*; import com.hisense.hiatmp.server_api.mapper.HighDangerMapper; @@ -66,10 +67,10 @@ public class HighDangerController { return ServerResponse.error("未找到当前用户"); } - Page page = new Page<>(pageNum, pageSize); - + //Page page = new Page<>(pageNum, pageSize); + PageHelper.startPage(pageNum, pageSize); // 将要查询的状态和部门id查询数据库,获得隐患排查表 - List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,page,search); + List statusCounts = highDangerMapper.getHigDangerDealt(highDangerBaseVO.getStatus(),cdepartmentid,search); // 待办 /*if("20".equals(highDangerBaseVO.getStatus())){ diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java index c21656e..68d0a55 100644 --- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java +++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/mapper/HighDangerMapper.java @@ -17,7 +17,7 @@ public interface HighDangerMapper extends BaseMapper{ List getStatusCounts(String cdepartmentid); // - List getHigDangerDealt(String status, String cdepartmentid, Page page, String search); + List getHigDangerDealt(String status, String cdepartmentid, String search); List getHigDangerDying(String status, String cdepartmentid);