From 295c611bd84b93463399d65c41737a16389746b6 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Fri, 21 Jul 2023 16:26:12 +0800
Subject: [PATCH] =?UTF-8?q?debug=20=E6=98=AF=E5=90=A6=E6=98=AF=20=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E6=9D=A1=E7=BA=BF=E4=B8=BB=E7=AE=A1=E5=8D=95=E4=BD=8D?=
 =?UTF-8?q?=20=E5=AE=A1=E6=89=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../statemachine/action/ProjectDeclareChoiceAction.java     |  2 ++
 .../pmapi/projectlib/manage/ProjectLibManage.java           | 13 +------------
 .../pmapi/todocenter/manage/TodoCenterManage.java           |  2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java
index c09b520..947acad 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/common/statemachine/action/ProjectDeclareChoiceAction.java
+++ b/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) {
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
index e5bb1d2..aa3679a 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java
+++ b/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);
     }
 }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
index be00450..238d0df 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java
+++ b/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);