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 601c2ac3..1bbe0901 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 @@ -452,7 +452,7 @@ public class PublisherController { //判断taskId是否为空,空的话则查库更新,应对部门视图不穿taskId的场景 if(UtilString.isEmpty(taskId)){ PublishListHistory pHistory = new PublishListHistory(); - taskId = pHistory.getLastPublishTaskIdByModelId(uuid); + taskId = pHistory.getLastPublishTaskIdByModelId(uuid).trim(); } return PALRepositoryQueryAPIManager.getInstance().getPublishPortalHtml(me, uuid, taskId, false); } @@ -957,9 +957,9 @@ public class PublisherController { * @return */ @Mapping("com.actionsoft.apps.coe.pal.publisher.createProcess") - public String createProcess(UserContext me,String palUUID) { + public String createProcess(UserContext me,String palUUID,String type) { ProcessPublishWeb web = new ProcessPublishWeb(me); - return web.createProcess(palUUID); + return web.createProcess(palUUID,type); } 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 fce3e4d2..a8946bdf 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 @@ -5194,12 +5194,16 @@ public class ProcessPublishWeb extends ActionWeb { * @param processDefId * @return */ - public String createProcess(String palUUID) { + public String createProcess(String palUUID,String type) { ResponseObject responseObject = ResponseObject.newOkResponse(); - - //获取发布流程组中运行中的流程 - String processDefId = SDK.getRepositoryAPI().getProcessDefIdOfRelease("obj_fb1c7a54b98b412187388c8bab407362"); - + String processDefId; + //获取工程制度标准运行中的版本 + if(type.equals("1")){ + processDefId = SDK.getRepositoryAPI().getProcessDefIdOfRelease("obj_fb1c7a54b98b412187388c8bab407362"); + }else{ + //获取发布流程运行中的版本 + processDefId = SDK.getRepositoryAPI().getProcessDefIdOfRelease("obj_5042cc444c1944c4aaf99001c23d0e4f\n"); + } String optionType = "";//发布类型 String subBoName = "";//子表名称 //获取文件属性