diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java index b1988063..8f11594a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsAttrDetailedList/service/impl/SarLawsAttrDetailedListServiceImpl.java @@ -50,7 +50,12 @@ public class SarLawsAttrDetailedListServiceImpl extends ServiceImpl lawsIds = sarLawsAttrDetailedListDao.selectLawsId(sarFindDto.getId(),(sarFindDto.getPage())-1,sarFindDto.getSize(),sarFindDto); if (CollectionUtils.isEmpty(lawsIds)){ - return null; + IPage list1 = new Page<>(); + list1.setCurrent(selectPage.getCurrent()); + list1.setTotal(selectPage.getTotal()); + list1.setSize(selectPage.getSize()); + list1.setPages(selectPage.getPages()); + return list1; } List list = sarLawsAttrDetailedListDao.selectLawsById(lawsIds,sarFindDto); for (LawsDto lawsDto:list){ diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml index c73b7f6c..bd2f2eed 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/IssueTrackMapper/IssueTrackMapper.xml @@ -20,7 +20,7 @@