Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/domain/MeetingExpertJudge.java

@@ -30,6 +30,8 @@ public class MeetingExpertJudge implements Serializable {
     @ApiModelProperty("会议ID")
     private Long meetingId;
 
+    private Long expertId;
+
     @ApiModelProperty("会议专家ID")
     private Long meetingExpertId;
 

pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingExpertJudgeManage.java

@@ -63,6 +63,7 @@ public class MeetingExpertJudgeManage {
                 throw BizException.wrap("履职评价已提交");
             }
             MeetingExpertJudge entity = BeanUtil.copyProperties(req, MeetingExpertJudge.class);
+            entity.setExpertId(expert.getExpertId());
             expertJudgeService.save(entity);
         } finally {
             distributedLock.releaseLock(key);

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -653,7 +653,10 @@ public class TodoCenterManage {
         List<ProjectInst> projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class)
                 .in(ProjectInst::getProjectId, projectIdList)
                 .orderByDesc(ProjectInst::getProjectId));
-        Map<String, Project> projectInfoMap = projectInstList.stream().collect(Collectors.toMap(ProjectInst::getInstCode, p -> projectsMap.get(p.getProjectId())));
+        Map<String, Project> projectInfoMap = projectInstList.stream()
+                .filter(p -> Objects.nonNull(p.getInstCode()) &&
+                        !TodoCenterConstant.Declared.NULL_INST_CODE.equals(p.getInstCode()))
+                .collect(Collectors.toMap(ProjectInst::getInstCode, p -> projectsMap.get(p.getProjectId())));
         List<String> instCodes = projectInstList.stream().map(ProjectInst::getInstCode).collect(Collectors.toList());
 
         // 查出用户工作流
@@ -793,7 +796,10 @@ public class TodoCenterManage {
         List<ProjectInst> projectInstList = projectInstService.list(Wrappers.lambdaQuery(ProjectInst.class)
                 .in(ProjectInst::getProjectId, projectIdList)
                 .orderByDesc(ProjectInst::getProjectId));
-        Map<String, Project> projectInfoMap = projectInstList.stream().collect(Collectors.toMap(ProjectInst::getInstCode, p -> projectsMap.get(p.getProjectId())));
+        Map<String, Project> projectInfoMap = projectInstList.stream()
+                .filter(p -> Objects.nonNull(p.getInstCode()) &&
+                        !TodoCenterConstant.Declared.NULL_INST_CODE.equals(p.getInstCode()))
+                .collect(Collectors.toMap(ProjectInst::getInstCode, p -> projectsMap.get(p.getProjectId())));
         List<String> instCodes = projectInstList.stream().map(ProjectInst::getInstCode).collect(Collectors.toList());
 
         // 查出用户工作流
@@ -1153,6 +1159,9 @@ public class TodoCenterManage {
                         !InstTypeEnum.DEPT_UNITED_REVIEW.getCode().equals(instType)) {
                     projectApplication.setIsConstruct(Boolean.TRUE);
                 }
+                if(StringUtils.isNotBlank(application.getRelatedExistsApplication())){
+                    projectApplication.setApplicationName(null);
+                }
                 projectApplication.setProjectVersion(project.getVersion());
                 projectApplicationService.save(projectApplication);
             }