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<Map<String, Object>> shapeMessageJson4 =
 					// getShapeMessageJson4(publishId);
-					// 当前流程所有节点
-                    
-					List<String> shapeIds = new ArrayList<>();
-					List<Map<String, Object>> shapeList = CoeDesignerUtil.getShapeMessageJson2(publishId);// 获取所有节点
-					if (shapeList != null && shapeList.size() > 0)
-						for (Map<String, Object> 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<PALRepositoryModel> 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);
 
 				}