Merge branch '20230731_ls2_operation+early_warning+safety_risk+portrait' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -264,14 +264,16 @@ public class ProjectLibManage {
         List<Long> applicationIds = applications.stream().map(ProjectApplication::getId).collect(Collectors.toList());
 
         //核心业务
-        List<ProjectCoreBusinessIndicators> coreBizs = projectCoreBusinessIndicatorsService.list(Wrappers.lambdaQuery(ProjectCoreBusinessIndicators.class)
-                .in(ProjectCoreBusinessIndicators::getApplicationId, applicationIds));
-        Map<Long,List<ProjectCoreBusinessIndicators>> coreBizMap = coreBizs.stream().collect(Collectors.groupingBy(ProjectCoreBusinessIndicators::getApplicationId));
-
-        Optional.ofNullable(applications).ifPresent(apps ->
-                vo.setProjectApplications(CollUtils.convert(apps,
-                        app -> ProjectHelper.convertVOWithMap(app,coreBizMap))
-                ));
+        if(CollUtil.isNotEmpty(applicationIds)){
+            List<ProjectCoreBusinessIndicators> coreBizs = projectCoreBusinessIndicatorsService.list(Wrappers.lambdaQuery(ProjectCoreBusinessIndicators.class)
+                    .in(ProjectCoreBusinessIndicators::getApplicationId, applicationIds));
+            Map<Long,List<ProjectCoreBusinessIndicators>> coreBizMap = coreBizs.stream().collect(Collectors.groupingBy(ProjectCoreBusinessIndicators::getApplicationId));
+
+            Optional.ofNullable(applications).ifPresent(apps ->
+                    vo.setProjectApplications(CollUtils.convert(apps,
+                            app -> ProjectHelper.convertVOWithMap(app,coreBizMap))
+                    ));
+        }
 
         List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectInfo);
         //查询采购备案
@@ -384,15 +386,17 @@ public class ProjectLibManage {
         List<Long> applicationIds = applications.stream().map(ProjectApplication::getId).collect(Collectors.toList());
 
         //核心业务
-        List<ProjectCoreBusinessIndicators> coreBizs = projectCoreBusinessIndicatorsService.list(Wrappers.lambdaQuery(ProjectCoreBusinessIndicators.class)
-                .in(ProjectCoreBusinessIndicators::getApplicationId, applicationIds));
-        Map<Long,List<ProjectCoreBusinessIndicators>> coreBizMap = coreBizs.stream().collect(Collectors.groupingBy(ProjectCoreBusinessIndicators::getApplicationId));
-
-        Optional.ofNullable(applications).ifPresent(apps ->
-                vo.setProjectApplications(CollUtils.convert(apps,
-                        app -> ProjectHelper.convertVOWithMap(app,coreBizMap))
-                ));
-
+        if(CollUtil.isNotEmpty(applicationIds)){
+            List<ProjectCoreBusinessIndicators> coreBizs = projectCoreBusinessIndicatorsService.list(Wrappers.lambdaQuery(ProjectCoreBusinessIndicators.class)
+                    .in(ProjectCoreBusinessIndicators::getApplicationId, applicationIds));
+            Map<Long,List<ProjectCoreBusinessIndicators>> coreBizMap = coreBizs.stream().collect(Collectors.groupingBy(ProjectCoreBusinessIndicators::getApplicationId));
+
+            Optional.ofNullable(applications).ifPresent(apps ->
+                    vo.setProjectApplications(CollUtils.convert(apps,
+                            app -> ProjectHelper.convertVOWithMap(app,coreBizMap))
+                    ));
+        }
+        
         //审批信息
         ProcessDetailReq req = new ProcessDetailReq();
         req.setInstanceId(projectInfo.getInstCode());