diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java index 0a90890a..304f5632 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/service/impl/SarStandItemsServiceImpl.java @@ -154,25 +154,9 @@ public class SarStandItemsServiceImpl extends ServiceImpl pageInfo = null; -// try { -// pageInfo = sarStandardsInfoService.getSarStandardsInfoPageBak(page); -// } catch (Exception e) { -// e.printStackTrace(); -// } List standId = new ArrayList<>(); -// for (SarStandardsInfo standardsInfo : pageInfo){ -//// if (standardsInfo.getAttrInfoCaseMap().get("FBGBJBD")!=null || standardsInfo.getAttrInfoCaseMap().get("fbgbjbd")!=null){ -// standId.add(standardsInfo.getId()); -//// } -// } + List list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); - List list=new ArrayList<>(); -// if (standId==null || standId.size()==0){ -// list = null; -// }else { - list = sarLawsAttrDetailedListDao.selectLawsByIdC((findStandDto.getPage()-1)*findStandDto.getSize(),findStandDto.getPage()*findStandDto.getSize(),standId,findStandDto.getStandName(), findStandDto.getStandType(),findStandDto.getFileType()); -// } IPage page1=new Page<>(); page1.setRecords(list); page1.setTotal(sarLawsAttrDetailedListDao.selectLawsByIdCount(standId,findStandDto.getStandName(),findStandDto.getStandType(),findStandDto.getFileType()).size()); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml index 66bd900a..836adab6 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml @@ -189,7 +189,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') @@ -217,7 +217,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') @@ -251,7 +251,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%') @@ -280,7 +280,7 @@ left join sar_standards_info a on ssi.stand_id = a.id LEFT JOIN sar_stand_attr_info b on a.ID = b.STAND_ID - 1=1 + 1=1 and a.ID is not null and (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')