Merge remote-tracking branch 'origin/master'

pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java

@@ -56,16 +56,20 @@ public class ProjectDeclareChoiceAction implements Action<ProjectStatusEnum, Pro
             project.setStage(ProjectStatusEnum.PROJECT_APPROVED.getCode());
             project.setStatus(ProjectStatusEnum.TO_BE_PURCHASED.getCode());
         }
+        final Boolean[] isFirstApp = {Boolean.FALSE};
         projectApplications.stream().forEach(app -> {
             Integer isFirst = app.getIsFirst();
             if(isFirst.equals(CommonEnum.YES.getCode())){
-                project.setStage(ProjectStatusEnum.NOT_APPROVED.getCode());
-                project.setStatus(ProjectStatusEnum.TO_BE_APP_REGISTER.getCode());
-                return;
+                isFirstApp[0] = Boolean.TRUE;
             }
         });
-        project.setStage(ProjectStatusEnum.PROJECT_APPROVED.getCode());
-        project.setStatus(ProjectStatusEnum.TO_BE_PURCHASED.getCode());
+        if(isFirstApp[0]){
+            project.setStage(ProjectStatusEnum.NOT_APPROVED.getCode());
+            project.setStatus(ProjectStatusEnum.TO_BE_APP_REGISTER.getCode());
+        }else{
+            project.setStage(ProjectStatusEnum.PROJECT_APPROVED.getCode());
+            project.setStatus(ProjectStatusEnum.TO_BE_PURCHASED.getCode());
+        }
     }
 
     private void preDeclareChoice(StateContext<ProjectStatusEnum, ProjectStatusChangeEvent> stateContext) {