diff --git a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java index b0502fad0e0ec980c41da0e813a74e4fc0e83ca4..9805b8ad00943ecac76e73a2975430dddceddece 100644 --- a/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/applicationpackage/gatewayimpl/ApplicationPackageGatewayImpl.java @@ -74,7 +74,7 @@ public class ApplicationPackageGatewayImpl implements ApplicationPackageGateway wrapper.select(columns); IPage resPage = appPkgMapper.selectPage(page, wrapper); - long total = resPage.getTotal() / condition.getPageSize(); + long total = resPage.getTotal(); List appDOs = resPage.getRecords(); List menus = ApplicationPackageConverter.toMenu(appDOs); diff --git a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java index 680677246499f1176478b079471a5c19b2c4d557..1cb48370c4bfd008c87ce01daa1eff477eeb28b9 100644 --- a/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/epkgpackage/gatewayimpl/EPKGPackageGatewayImpl.java @@ -93,7 +93,7 @@ public class EPKGPackageGatewayImpl implements EPKGPackageGateway { IPage resPage = ePKGPkgMapper.selectPage(page, wrapper); List rpmDOs = resPage.getRecords(); List rPMMenus = EPKGPackageConverter.toMenu(rpmDOs); - long total = resPage.getTotal() / condition.getPageSize(); + long total = resPage.getTotal(); Map res = Map.ofEntries( Map.entry("total", total), diff --git a/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java index e657750f349dc7a8a3c8cf121a472ea65a09ce42..44fe4c58f9b2410bd22fa9df28c23e0ed5c12379 100644 --- a/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/fieldpkg/FieldPkgGatewayImpl.java @@ -63,11 +63,10 @@ public class FieldPkgGatewayImpl implements FieldPkgGateway { IPage resPage = mapper.selectPage(page, wrapper); List list = resPage.getRecords(); List voList = FieldPkgConverter.toVo(list); - long total = voList.size(); + long total = resPage.getTotal(); if (condition.getOs() == null && condition.getArch() == null && condition.getCategory() == null) { voList = aggregateList(voList, condition, wrapper); - total = voList.size(); } return Map.ofEntries( diff --git a/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java index b4d16c1dbe3bf9e878f761eeeda83733d405c840..4fd86b43ad02cccdff334c9a32ca977a314dc519 100644 --- a/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/oepkg/gatewalmpl/OEPackageGatewayImpl.java @@ -95,7 +95,7 @@ public class OEPackageGatewayImpl implements OEPackageGateway { List oepkgDOs = resPage.getRecords(); List oeMenus = OEPackageConverter.toMenu(oepkgDOs); - long total = resPage.getTotal() / condition.getPageSize(); + long total = resPage.getTotal(); Map res = Map.ofEntries( Map.entry("total", total), diff --git a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java index 43613f2910cca236b03c855843c341923422c563..7a4611a96f672ee0ac105d915bd46188ed87b0c3 100644 --- a/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java +++ b/src/main/java/com/easysoftware/infrastructure/rpmpackage/gatewayimpl/RPMPackageGatewayImpl.java @@ -97,7 +97,7 @@ public class RPMPackageGatewayImpl implements RPMPackageGateway { IPage resPage = rPMPkgMapper.selectPage(page, wrapper); List rpmDOs = resPage.getRecords(); List rPMMenus = RPMPackageConverter.toMenu(rpmDOs); - long total = resPage.getTotal() / condition.getPageSize(); + long total = resPage.getTotal(); Map res = Map.ofEntries( Map.entry("total", total),