分页问题修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PlanTaskController.java

@@ -1048,9 +1048,6 @@ public class PlanTaskController extends AbstractBaseController {
                                                   @RequestBody(required = false) PlanTaskPageParam queryRequests) {
         ReginParams reginParams = getSelectedOrgInfo();
         queryRequests.setBizOrgCode(reginParams.getPersonIdentity().getBizOrgCode());
-        if (queryRequests.getPageNumber() >= 1){
-            queryRequests.setPageNumber((queryRequests.getPageNumber() - 1)* queryRequests.getPageSize());
-        }
         Page<HashMap<String, Object>> list = planTaskService.getPlanTaskPageList(queryRequests);
         Object ob = list.getContent().size() > 0 ? ToJson.tojson(list) : null;
         return CommonResponseUtil.success(ob);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/service/impl/PlanTaskServiceImpl.java

@@ -1811,9 +1811,13 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 
     @Override
     public Page<HashMap<String, Object>> getPlanTaskPageList(PlanTaskPageParam param) {
+        CommonPageable commonPageable = new CommonPageable(param.getPageNumber(), param.getPageSize());
+        if (param.getPageNumber() >= 1) {
+            param.setPageNumber((param.getPageNumber() - 1)* param.getPageSize());
+        }
         long total = planTaskMapper.countData(param);
         List<HashMap<String, Object>> content = planTaskMapper.planTaskPage(param);
-        Page<HashMap<String, Object>> result = new PageImpl<>(content, param, total);
+        Page<HashMap<String, Object>> result = new PageImpl<>(content, commonPageable, total);
         return result;
     }