From c1a7f583f6ddb37c16c5bb9fe60e80e206e6ee90 Mon Sep 17 00:00:00 2001 From: lihongyu <504404568@qq.com> Date: Mon, 21 Nov 2022 13:56:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E5=B8=83=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=97=B6=E5=B8=A6=E5=87=BA=E6=96=B0=E7=89=88=E7=9A=84?= =?UTF-8?q?=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../publisher/client/web/ProcessPublishWeb.java | 17 ++++++++++------- .../pubEvent/ProcessEndAfterEvent.java | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java index 3633e037..38a6a979 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/web/ProcessPublishWeb.java @@ -1733,13 +1733,6 @@ public class ProcessPublishWeb extends ActionWeb { // List> shapeMessageJson4 = // getShapeMessageJson4(publishId); - // 当前流程所有节点 - - List shapeIds = new ArrayList<>(); - List> shapeList = CoeDesignerUtil.getShapeMessageJson2(publishId);// 获取所有节点 - if (shapeList != null && shapeList.size() > 0) - for (Map map : shapeList) - shapeIds.add((String) map.get("id")); /******************** 附件 ************************/ // 文件或节点自身附件 @@ -3972,6 +3965,16 @@ public class ProcessPublishWeb extends ActionWeb { for (int i = 0; i < palarr.size(); i++) { JSONObject paljb = palarr.getJSONObject(i); String id = paljb.getString("id"); + //获取最新要更新版本的id + List temp = PALRepositoryCache.getByVersionId(wsId, id); + if(temp.size()>0) { + for (PALRepositoryModel palRepositoryModel : temp) { + if(!palRepositoryModel.isPublish()&&!palRepositoryModel.isStop()) { + id = palRepositoryModel.getId(); + } + } + } + String methodId = paljb.getString("methodId"); PALRepositoryModel model = PALRepositoryCache.getCache().get(id); //ID获取L1 L2 L3的值 diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java index 1ce54b76..600b00b8 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java @@ -885,7 +885,7 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList for (DepartmentModel departmentModel : departmentsByCompanyId) { String id = departmentModel.getId(); // 查询未注销的部门并且去掉系统部门 - if (!departmentModel.isClosed() && !"e79281b1-2f81-4895-b30e-9f96e9ad0e2c".equals(id)) { + if (!departmentModel.isClosed() && !"5bc3a2dc-3bd2-4376-bcc3-5612e28e55fe".equals(id)&&!"e79281b1-2f81-4895-b30e-9f96e9ad0e2c".equals(id)&&!"65048aee-157f-49f2-a2dc-5903dd26f519".equals(id)) { getUserList(jsonObject, arr_test, arr, id, processid); }