提交代码

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

@@ -203,7 +203,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             result.getRecords().forEach(item -> {
                 item.setNodeReViewStateList(ReviewList.get(item.getId()));
             });
-            page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
+            page.setTotal(result.getTotal());
             return TableDataInfo.build(result);
         }
         if ((!"".equals(bo.getBeginTime()) && !ObjectUtils.isEmpty(bo.getBeginTime())) || (!"".equals(bo.getCreateBy()) && !ObjectUtils.isEmpty(bo.getCreateBy()))) {
@@ -216,7 +216,7 @@ public class ZEngineeringCivilServiceImpl implements IZEngineeringCivilService {
             result.getRecords().forEach(item -> {
                 item.setNodeReViewStateList(ReviewList.get(item.getId()));
             });
-            page.setTotal(!ObjectUtils.isEmpty(result.getRecords()) ? result.getRecords().get(0).getTotal() : 0);
+            page.setTotal(result.getTotal());
             return TableDataInfo.build(result);
         }
         result = baseMapper.queryPageList(bo, page, (pageQuery.getPageNum() - 1) * pageQuery.getPageSize(), pageQuery.getPageSize());