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 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 twoVersions) { - res = new CompareUtils().compareToJson(twoVersions.get(0), twoVersions.get(1),null); - return res; + return new CompareUtils().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 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);