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 ebe87f49..c896c157 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/at/getConsultHour.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/getConsultHour.java index d53374b7..359d9556 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/getConsultHour.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/at/getConsultHour.java @@ -21,8 +21,10 @@ public class getConsultHour extends AbstExpression { String bindid = getParameter(s, 1); String taskId = getParameter(s, 2); String deadline = getParameter(s, 3); - //DEADLINE_REPLY + System.out.println("bindid=========="+bindid); + System.out.println("taskId=========="+taskId); + System.out.println("deadline=========="+deadline); //计算时间差 @@ -46,6 +48,7 @@ public class getConsultHour extends AbstExpression { e.printStackTrace(); } + System.out.println("hours============="+hours); return hours+""; } } diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java index 96be096a..d0e18e69 100644 --- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java +++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/event/PublishExecuteListenerInterfaceImpl.java @@ -738,23 +738,26 @@ public class PublishExecuteListenerInterfaceImpl extends ExecuteListener impleme for(RowMap oneRowMap:rlatRowMap){ String relationshapetext=oneRowMap.getString("RELATIONSHAPETEXT"); JSONObject js=JSONObject.parseObject(relationshapetext); - dempId += js.getString("id") + ","; - dempname += js.getString("name") + ","; + if(js!=null){ + dempId += js.getString("id") + ","; + dempname += js.getString("name") + ","; + } } - dempId = dempId.substring(0, dempId.length() - 1); - dempname = dempname.substring(0, dempname.length() - 1); - if(dempId!=null && dempname!=null){ - bo.set("PUBLISHDEPT",dempname); + if(dempId!=null){ + dempId = dempId.substring(0, dempId.length() - 1); bo.set("PUBLISHDEPTID",dempId); } - + if(dempname!=null){ + dempname = dempname.substring(0, dempname.length() - 1); + bo.set("PUBLISHDEPT",dempname); + } PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(plid); String version=String.valueOf(palRepositoryModel.getVersion()); - - String plver=version.substring(0,version.indexOf(".")) + "." + version.substring(version.length() - 1, version.length()); - - bo.set("VERSION",plver); + if(version!=null){ + String plver=version.substring(0,version.indexOf(".")) + "." + version.substring(version.length() - 1, version.length()); + bo.set("VERSION",plver); + } bo.set("PROCESS_ARCHITECTURE_L1",PROCESS_ARCHITECTURE_L1.getString("PROPERTYVALUE")); bo.set("PROCESS_ARCHITECTURE_L2",PROCESS_ARCHITECTURE_L2.getString("PROPERTYVALUE")); bo.set("PROCESS_ARCHITECTURE_L3",PROCESS_ARCHITECTURE_L3.getString("PROPERTYVALUE"));