diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java index 6e097342..18bfa191 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java @@ -170,17 +170,18 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl gbStandMenu = sarStandMenuDao.getGBStandMenu().stream().filter(sarStandMenu -> sarStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); + List gbStandMenu = sarStandMenuDao.getGBStandMenu(); List gbRelations = BeanCopyUtils.copyBeanList(gbStandMenu, StandMenuRelation.class); // 外标 - List fbStandMenu = sarStandMenuDao.getFBStandMenu().stream().filter(sarStandMenu -> sarStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); + List fbStandMenu = sarStandMenuDao.getFBStandMenu(); List fbRelations = BeanCopyUtils.copyBeanList(fbStandMenu, StandMenuRelation.class); // 企标 - List esStandMenu = sarBussStandMenuService.list().stream().filter(sarBussStandMenu -> sarBussStandMenu.getMenuId().length() > 30).collect(Collectors.toList()); + LambdaQueryWrapper bussWrapper = new LambdaQueryWrapper<>(); + bussWrapper.apply("LENGTH(menu_id) > {0}", 30); + List esStandMenu = sarBussStandMenuService.list(bussWrapper); List esRelations = BeanCopyUtils.copyBeanList(esStandMenu, StandMenuRelation.class); // 计算每个节点的数值 TsResources.get(0).calculateAndSetCounts(gbRelations, fbRelations, esRelations, 0); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml index 3e1cb7c5..fa7d9c2d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml @@ -147,13 +147,13 @@