diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java index ca2b9674..652197ae 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java @@ -40,15 +40,17 @@ public class PDMCSarLawsStandInfoController extends BaseController> getSarStandardsInfoPage( @RequestParam(value = "current", defaultValue = "1") Long current, - @RequestParam(value = "limit",required = false,defaultValue = "100") Long limit) throws Exception { - if (ObjectUtil.isEmpty(current)){ - current = 1L; - } + @RequestParam(value = "limit",required = false) Long limit) throws Exception { if (ObjectUtil.isEmpty(limit)){ - limit = 100L; + int count = pdmcSarLawsStandInfoService.getSarStandardsCount(); + if (count == 0) { + return Result.error("文件信息为空"); + } + limit = (long) count; } Page page = new Page<>(current, limit); Page sarStandardsInfoPage = pdmcSarLawsStandInfoService.getSarStandardsInfo(page); + PageInfo pdmcSarLawsStandInfoPageInfo = new PageInfo<>(); pdmcSarLawsStandInfoPageInfo.setList(sarStandardsInfoPage.getRecords()); pdmcSarLawsStandInfoPageInfo.setPageNo((int)sarStandardsInfoPage.getCurrent()); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java index 9b3b216c..23595d11 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java @@ -12,4 +12,5 @@ import java.util.List; public interface PDMCSarLawsStandInfoDao extends BaseMapper { Page getSarStandardsInfo(@Param("page")Page page); + int getSarStandardsCount(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java index ce24327b..2e6fb455 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java @@ -14,4 +14,6 @@ import java.util.List; */ public interface PDMCSarLawsStandInfoService extends IService { Page getSarStandardsInfo(Page page); + + int getSarStandardsCount(); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java index 3fb7237a..1a046032 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java @@ -23,4 +23,9 @@ public class PDMCSarLawsStandInfoServiceImpl extends ServiceImpl +