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 652197ae..fd974edd 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 @@ -41,20 +41,20 @@ public class PDMCSarLawsStandInfoController extends BaseController> getSarStandardsInfoPage( @RequestParam(value = "current", defaultValue = "1") Long current, @RequestParam(value = "limit",required = false) Long limit) throws Exception { + Long count = pdmcSarLawsStandInfoService.getSarStandardsCount(); if (ObjectUtil.isEmpty(limit)){ - int count = pdmcSarLawsStandInfoService.getSarStandardsCount(); if (count == 0) { return Result.error("文件信息为空"); } - limit = (long) count; + limit = count; } - Page page = new Page<>(current, limit); + Page page = new Page<>(current, limit,false); Page sarStandardsInfoPage = pdmcSarLawsStandInfoService.getSarStandardsInfo(page); PageInfo pdmcSarLawsStandInfoPageInfo = new PageInfo<>(); pdmcSarLawsStandInfoPageInfo.setList(sarStandardsInfoPage.getRecords()); pdmcSarLawsStandInfoPageInfo.setPageNo((int)sarStandardsInfoPage.getCurrent()); - pdmcSarLawsStandInfoPageInfo.setCount(sarStandardsInfoPage.getTotal()); + pdmcSarLawsStandInfoPageInfo.setCount(count); pdmcSarLawsStandInfoPageInfo.setPageSize((int) sarStandardsInfoPage.getSize()); if (pdmcSarLawsStandInfoPageInfo.getList().isEmpty()) { return Result.error("404","文件信息为空",pdmcSarLawsStandInfoPageInfo); 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 23595d11..f8d095a9 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,5 +12,5 @@ import java.util.List; public interface PDMCSarLawsStandInfoDao extends BaseMapper { Page getSarStandardsInfo(@Param("page")Page page); - int getSarStandardsCount(); + Long 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 2e6fb455..bad50303 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 @@ -15,5 +15,5 @@ import java.util.List; public interface PDMCSarLawsStandInfoService extends IService { Page getSarStandardsInfo(Page page); - int getSarStandardsCount(); + Long 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 1a046032..55cb0caa 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 @@ -25,7 +25,7 @@ public class PDMCSarLawsStandInfoServiceImpl extends ServiceImpl - select count(1) - from sar_standards_info - left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc + from (select + + from sar_standards_info ssi + left join sar_stand_menu ssm on ssi.id=ssm.STAND_ID) temp