diff --git a/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar b/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar index 46d21e12..47831a4b 100644 Binary files a/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar and b/com.awspaas.user.apps.yili.integration/lib/com.awspaas.user.apps.yili.integration.jar differ diff --git a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/OaPendComponent.java b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/OaPendComponent.java index d6f39dd4..541a62d5 100644 --- a/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/OaPendComponent.java +++ b/com.awspaas.user.apps.yili.integration/src/com/awspaas/user/apps/integration/oa/OaPendComponent.java @@ -472,7 +472,7 @@ public class OaPendComponent { if (taskInstance!=null){ String actionName = getActionName(taskInstance); - if (actionName.equals("确认发布")||equalsAction(GO_BACK, actionName)||equalsAction(TERMINATION,actionName) ||actionName.equals("确认征询结果") || actionName.equals("传阅")){ + if (actionName.equals("确认发布")||equalsAction(GO_BACK, actionName)||equalsAction(TERMINATION,actionName) ||actionName.equals("确认征询结果")){ //流程结束时,归档所有任务 xmlDatasUtil.setCurrentnodetype("1"); //如果是终止或者废止的话,将历史记录全部更新 @@ -490,8 +490,14 @@ public class OaPendComponent { } } catch (Exception e) { } + /** + * 处理场景为流程状态已结束,用户进行传阅操作,将状态改为归档。 + */ + }else if(pec.getProcessInstance().getControlState().equals("end") && actionName.equals("传阅")) { + xmlDatasUtil.setCurrentnodetype("1"); }else{ xmlDatasUtil.setCurrentnodetype("0"); + } }else { xmlDatasUtil.setCurrentnodetype("0");