Merge branch 'ls2_early_warning_0731' of http://git.ningdatech.com/liushuai/project-management into dev

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DeclaredProjectManage.java

@@ -154,7 +154,7 @@ public class DeclaredProjectManage {
         Project project = new Project();
         BeanUtils.copyProperties(projectInfo,project);
         Map<String, OrgInfoDTO> orgModelMap = defaultDeclaredProjectManage.buildOrgModelMap(employeeCode,project);
-        String instanceId = processService.newStartProcess(model.getProcessDefId(),model.getFormId(), params,orgModelMap);
+        String instanceId = processService.startProcessLs(model, params,orgModelMap);
         log.info("申报项目成功 【{}】", instanceId);
 
         //如果是重新提交的话 判断下 项目是否存在

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

@@ -763,7 +763,8 @@ public class ProjectLibManage {
         // 查询应用
         List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
                 .eq(ProjectApplication::getProjectCode, vo.getProjectCode())
-                .eq(ProjectApplication::getIsConstruct, Boolean.FALSE));
+                .eq(ProjectApplication::getIsConstruct, Boolean.FALSE)
+                .eq(ProjectApplication::getProjectVersion, projectInfo.getVersion()));
 
         Optional.ofNullable(applications).ifPresent(apps ->
                 vo.setProjectApplications(CollUtils.convert(apps,