diff --git a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar index 8de90a57..f8275cf8 100644 Binary files a/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar and b/com.actionsoft.apps.coe.pal.publisher/lib/com.actionsoft.apps.coe.pal.publisher.jar differ 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 c3bc6ade..7bcf0472 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 @@ -1019,6 +1019,10 @@ public class ProcessPublishWeb extends ActionWeb { // method排序 List methodList = PALMethodCache.getPALMethodList(true); for (String method : methodList) { + //过滤控制/组织数据 + if(method.equals("control") || method.equals("org")){ + continue; + } JSONArray array = getPublishRepositoryJSONArray(repositoryList, method, wsId, profitionIcon, checkbox, checkboxIds); if (array.size() > 0) { JSONObject object = new JSONObject(); @@ -1888,6 +1892,10 @@ public class ProcessPublishWeb extends ActionWeb { JSONArray rootArray = new JSONArray(); List methodList = PALMethodCache.getPalMehtodList(teamId, _uc.getUID(), true); for (String method : methodList) { + //新建发布过滤掉控制/组织类数据 + if(method.equals("control") || method.equals("org")){ + continue; + } JSONObject object = new JSONObject(); object.put("id", method); object.put("name", I18nRes.findValue(CoEConstant.APP_ID, method)); @@ -1906,6 +1914,7 @@ public class ProcessPublishWeb extends ActionWeb { for (PALRepositoryModel verModel : verList) { if (verModel.isPublish()) { checkbox = false; + continue; } } if (checkbox) { diff --git a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js index c994c3ec..170ed810 100644 --- a/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js +++ b/com.actionsoft.apps.coe.pal.publisher/web/com.actionsoft.apps.coe.pal.publisher/js/coe.pal.process.publish.multiple.js @@ -749,6 +749,7 @@ function addProcess(type) { buttons:[ {text:'确定',cls:"blue",handler:function(){ window.$.simpleAlert("请稍等...", "loading"); + debugger; if (type == 'new') { if (treeCheckedNewArr.length == 0) { $.simpleAlert('发布流程不能为空');