diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index d7b94aa97..f2f5d9c30 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -10979,9 +10979,15 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl> getNewData(Map params, String cut,boolean administrator) { + +// params.put("numberPlatform","NT2"); +// params.put("carPlatform","NT2"); + //新数据 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.like(ProblemManagementEO::getProjectId,params.get("projectLibraryId")); + wrapper.or().eq(ProblemManagementEO::getProjectId,params.get("numberPlatform")); + wrapper.or().eq(ProblemManagementEO::getProjectId, params.get("carPlatform")); List managementEOList = problemManagementEOService.list(wrapper); //法规 List lawsIdList = managementEOList.stream() @@ -11078,6 +11084,9 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl projectLibraryBaseListTemp = projectLibraryBaseList.stream() .filter(e->StringUtils.isNotBlank(problemManagementEO.getProjectId()) && problemManagementEO.getProjectId().contains(e.getId())).collect(Collectors.toList()); + if(ObjectUtils.isEmpty(projectLibraryBaseListTemp)){ + map.put("projectName",problemManagementEO.getProjectId()); + } //目标市场数据字典 List targetMarketList = sysDictService.queryDictItemsByCode(DicCodeEnum.REGION.getCode()); List projectNameList = new ArrayList<>();