功能修改-sjx

blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java

@@ -164,10 +164,10 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
 				baseMapper.insert(projectMilestoneClone);
 			} else {
 				// 获取所有得节点信息，看是否都已经完成
-				FmProjectApplicationEntity fmProjectApplication = fmProjectMilestone.getFmProjectApplication();
+				FmProjectApplicationEntity fmProjectApplication = new FmProjectApplicationEntity();
 				List<FmProjectMilestoneEntity> fmProjectMilestoneList = baseMapper
 						.selectList(new QueryWrapper<FmProjectMilestoneEntity>().lambda()
-								.eq(FmProjectMilestoneEntity::getPaId,fmProjectApplication.getId()));
+								.eq(FmProjectMilestoneEntity::getPaId,fmProjectMilestone.getPaId()));
 				Boolean isOk = Boolean.TRUE;
 				if (fmProjectMilestoneList != null && fmProjectMilestoneList.size() > 0) {
 					for (FmProjectMilestoneEntity projectMilestone : fmProjectMilestoneList) {
@@ -176,6 +176,7 @@ public class FmProjectMilestoneServiceImpl extends BaseServiceImpl<FmProjectMile
 						}
 					}
 					if (isOk) {
+						fmProjectApplication.setId(fmProjectMilestone.getPaId());
 						fmProjectApplication.setProjectEnd(new Date());
 						fmProjectApplication.setApprovalStatus(8L);
 						fmProjectApplicationService.updateById(fmProjectApplication);