代码提交

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -264,6 +264,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
             }
         }
 
+        if(null != dataObject) {
             taskName = dataObject.getString("name");
             ProjectInitiation projectInitiation = new ProjectInitiation();
             projectInitiation.setInstanceId(instanceId);
@@ -332,6 +333,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                 e.printStackTrace();
             }
         }
+    }
 
     /**
      * 获取任务的执行单位id 和 TaskType
@@ -609,13 +611,13 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                 taskName = taskName + "/" + sjStatus;
             }
         }
-        if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
-            if (project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) {
-                taskName = StringUtils.substringBefore(project.getStatus(), "/");
-            } else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
-                taskName = StringUtils.substringAfter(project.getStatus(), "/");
-            }
-        }
+//        if ("流程结束！".equals(taskName) && !ObjectUtils.isEmpty(project.getStatus())) {
+//            if (project.getStatus().contains(ProjectInitiationEnum.设计资料审批.getName())) {
+//                taskName = StringUtils.substringBefore(project.getStatus(), "/");
+//            } else if (project.getStatus().contains(ProjectInitiationEnum.安装资料审批.getName())) {
+//                taskName = StringUtils.substringAfter(project.getStatus(), "/");
+//            }
+//        }
 
         project.setStatus(taskName);
         projectService.updateById(project);