debug 是否是 上级条线主管单位 审批

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

@@ -64,6 +64,8 @@ public class ProjectDeclareChoiceAction implements Action<ProjectStatusEnum, Pro
                 return;
             }
         });
+        project.setStage(ProjectStatusEnum.PROJECT_APPROVED.getCode());
+        project.setStatus(ProjectStatusEnum.TO_BE_PURCHASED.getCode());
     }
 
     private void preDeclareChoice(StateContext<ProjectStatusEnum, ProjectStatusChangeEvent> stateContext) {

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

@@ -1180,17 +1180,6 @@ public class ProjectLibManage {
             return res;
         }
 
-        return checkTwoProjectChanges(res,twoVersions);
-    }
-
-    /**
-     * 列出 2个版本项目的 不同字段
-     * @param res
-     * @param twoVersions
-     * @return
-     */
-    private JSONObject checkTwoProjectChanges(JSONObject res, List<Project> twoVersions) {
-        res = new CompareUtils<Project>().compareToJson(twoVersions.get(0), twoVersions.get(1),null);
-        return res;
+        return new CompareUtils<Project>().compareToJson(twoVersions.get(0), twoVersions.get(1),null);
     }
 }

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

@@ -591,7 +591,7 @@ public class TodoCenterManage {
                 List<ProgressNode> children = p.getChildren();
                 ProgressNode progressNode = children.get(0);
                 String userId = progressNode.getUserId();
-                if(StringUtils.isNotBlank(userId)){
+                if(StringUtils.isBlank(userId)){
                     return;
                 }
                 UserFullInfoDTO userFullInfoDTO = userInfoHelper.getUserFullInfoByEmployeeCode(userId);