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 b48ecf47..576c62d1 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/PublisherController.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java index 5b9f308f..601c2ac3 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/PublisherController.java @@ -957,9 +957,9 @@ public class PublisherController { * @return */ @Mapping("com.actionsoft.apps.coe.pal.publisher.createProcess") - public String createProcess(UserContext me,String palUUID, String processDefId) { + public String createProcess(UserContext me,String palUUID) { ProcessPublishWeb web = new ProcessPublishWeb(me); - return web.createProcess(palUUID,processDefId); + return web.createProcess(palUUID); } @@ -969,9 +969,9 @@ public class PublisherController { * @return */ @Mapping("com.actionsoft.apps.coe.pal.publisher.createProcess_processTermination") - public String createProcessTermination(UserContext me,String palUUID, String processDefId) { + public String createProcessTermination(UserContext me,String palUUID) { ProcessPublishWeb web = new ProcessPublishWeb(me); - return web.createProcessTermination(palUUID,processDefId); + return web.createProcessTermination(palUUID); } @Mapping("com.actionsoft.apps.coe.pal.publisher.getEditPalByUserId") 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 9709c7b6..fce3e4d2 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 @@ -5277,7 +5277,9 @@ public class ProcessPublishWeb extends ActionWeb { * @param processDefId * @return */ - public String createProcessTermination(String palUUID,String processDefId) { + public String createProcessTermination(String palUUID) { + + String processDefId = SDK.getRepositoryAPI().getProcessDefIdOfRelease("obj_fb1c7a54b98b412187388c8bab407362"); //需要先判断是否有发布状态的版本,有则允许发布,否则提醒 ResponseObject responseObject = ResponseObject.newOkResponse(); PALRepositoryModel thisModel = PALRepositoryCache.getCache().get(palUUID);