巡检区域相关接口查询

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAreaServiceImpl.java

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -114,10 +115,12 @@ public class PatrolInspectionAreaServiceImpl extends AbstractCrudService<PatrolI
             queryWrapper.eq(PatrolInspectionArea::getAreaName, areaName);
         }
         queryWrapper.orderByDesc(PatrolInspectionArea::getId);
-        Integer total = this.list(queryWrapper).size();
+//        Integer total = this.list(queryWrapper).size();
+        IPage<PatrolInspectionArea> a = baseMapper.selectPage(page, queryWrapper);
         page = this.page(page, queryWrapper);
-        this.ToCommonPage(page);
-        return new CommonPage<>(page.getRecords(), total, page.getSize(), page.getCurrent());
+//        this.ToCommonPage(page);
+
+        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getSize(), page.getCurrent());
     }