Merge remote-tracking branch 'origin/zdsz3.0' into zdsz3.0

ruoyi-zdsz/src/main/java/com/ruoyi/zdsz/service/impl/ZComprehensiveServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.zdsz.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.PageUtils;
 import com.ruoyi.common.utils.StringUtils;
@@ -67,7 +68,11 @@ public class ZComprehensiveServiceImpl implements IZComprehensiveService {
 //        Page<ZComprehensiveVo> list = baseMapper.getPageList(bo,page);
 //        return PageUtils.buildDataInfo(list);
         Page<ZComprehensiveVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
-        Page<ZComprehensiveVo> result = baseMapper.queryPageList(bo,page,pageQuery.getPageNum(), pageQuery.getPageSize());
+        Integer pageNum = pageQuery.getPageNum();
+        if (!ObjectUtils.isEmpty(pageNum)&&pageNum>=1){
+            pageNum-=1;
+        }
+        Page<ZComprehensiveVo> result = baseMapper.queryPageList(bo,page,pageNum, pageQuery.getPageSize());
         page.setTotal((result.getRecords() != null&&!result.getRecords().isEmpty()) ? result.getRecords().get(0).getTotal():0);
         return TableDataInfo.build(result);
     }