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 5c606c3e..ca9ed9a3 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/util/ProcesNumberUtil.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java index ad8ff04a..850de95b 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/client/util/ProcesNumberUtil.java @@ -216,11 +216,12 @@ public class ProcesNumberUtil { } if (UtilString.isNotEmpty(levelFour)) { levelFour = levelFour.substring(levelFour.lastIndexOf(".") + 1, levelFour.length()); - } else { - levelFour = "00"; } - - levelnum = levelOne + "." + levelTwo + "." + levelThree + "." + levelFour; + if(UtilString.isNotEmpty(levelFour)){ + levelnum = levelOne + "." + levelTwo + "." + levelThree + "." + levelFour; + }else{ + levelnum = levelOne + "." + levelTwo + "." + levelThree; + } } String updateSql = "update BO_ACT_COE_PUBLISH_C set CHANGE_NUMBER = '%s' where ID = '%s'"; @@ -336,11 +337,13 @@ public class ProcesNumberUtil { if (UtilString.isNotEmpty(levelFour)) { levelFour = levelFour.substring(levelFour.lastIndexOf(".") + 1, levelFour.length()); - } else { - levelFour = "00"; + } + if(UtilString.isNotEmpty(levelFour)){ + levelnum = levelOne + "." + levelTwo + "." + levelThree + "." + levelFour; + }else{ + levelnum = levelOne + "." + levelTwo + "." + levelThree; } - levelnum = levelOne + "." + levelTwo + "." + levelThree + "." + levelFour; } 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 4b61122d..b0db2f45 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 @@ -3375,6 +3375,7 @@ public class ProcessPublishWeb extends ActionWeb { if (stopBo != null) { obj.put("stopFileName", stopBo.getString("STOPFILENAME")); obj.put("stopFileId", stopBo.getString("STOPFILEID")); + PALRepositoryModel model = PALRepositoryCache.getCache().get(stopBo.getString("STOPFILEID")); if (model != null) { obj.put("fileVersion", VersionUtil.getVersionStr(model.getVersion())); diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java index 43b5d8f0..ba7f673e 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent_new.java @@ -1114,7 +1114,7 @@ public class ProcessEndAfterEvent_new extends ExecuteListener implements Execute //插入实时更新人数表 BO realTimeBO=new BO(); realTimeBO.set("USREID", user); - realTimeBO.set("DEPID", SDK.getORGAPI().getUser(user).getDepartmentId()); + realTimeBO.set("DEPID", ""); realTimeBO.set("BUNAME",""); realTimeBO.set("TITLE", processInstance.getTitle()); realTimeBO.set("PROCESSID", processInstance.getId());