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 6616b3b3..6a29802e 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 01a5c19c..0f165ace 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 @@ -4,6 +4,7 @@ import com.actionsoft.bpms.bo.engine.BO; import com.actionsoft.bpms.commons.database.RowMap; import com.actionsoft.bpms.util.DBSql; import com.actionsoft.bpms.util.UUIDGener; +import com.actionsoft.bpms.util.UtilString; import com.actionsoft.sdk.local.SDK; import java.util.List; @@ -63,7 +64,20 @@ public class ProcesNumberUtil { //查询出所有的发布流程 List dataList = SDK.getBOAPI().query("BO_ACT_COE_PUBLISH_N").addQuery("BINDID=", bindId).list(); //依次生成编号~并回填 - String levelnum = levelOne + "." + (levelTwo.isEmpty() ? "00" : levelTwo) + (levelThree.isEmpty() ? "00" : levelThree); + + if(UtilString.isNotEmpty(levelTwo)){ + String[] str = levelTwo.split("."); + levelTwo =str[1]; + }else{ + levelTwo = "00"; + } + if(UtilString.isNotEmpty(levelThree)){ + String[] str = levelThree.split("."); + levelThree =str[2]; + }else{ + levelThree = "00"; + } + String levelnum = levelOne + "." + levelTwo + "." + levelThree; String updateSql = "update BO_ACT_COE_PUBLISH_N set PROCESS_NUMBER='%s' where ID = '%S'"; for (BO nowData : dataList) { String number = getProcessNum(levelnum, orgCode); diff --git a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java index 86bd45aa..07c5d4df 100755 --- a/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java +++ b/com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java @@ -760,7 +760,7 @@ public class DesignerRelationShapeWeb extends ActionWeb { //JSONObject jsonObject = JSONObject.parseObject(json); JSONArray jsonArr_new= new JSONArray(); JSONArray objects=JSONArray.parseArray(treeJson); - //角色图属性代码是role/绩效图属性代码是 + //角色图属性代码是role/绩效图属性代码为Process_performance_metrics进行判断 if (attrId.equals("role") || attrId.equals("Process_performance_metrics")) { if (objects != null) { for (int i = 0; i < objects.size(); i++) { @@ -782,7 +782,28 @@ public class DesignerRelationShapeWeb extends ActionWeb { } } macroLibraries.put("treeData", jsonArr_new.toString()); - } else { + } else if(attrId.equals("post")){ + if (objects != null) { + for (int i = 0; i < objects.size(); i++) { + String id= objects.getJSONObject(i).getString("id"); + String url =objects.getJSONObject(i).getString("url"); + if (UtilString.isNotEmpty(url)) { + List> nodeElements = CoeDesignerUtil.getShapeMessageJson4(id); + if(nodeElements.size()>0){ + String title = nodeElements.get(0).get("title").toString(); + if(title.equals("岗位")){ + jsonArr_new.add(objects.getJSONObject(i)); + } + } + }else{ + jsonArr_new.add(objects.getJSONObject(i)); + } + + + } + } + macroLibraries.put("treeData", jsonArr_new.toString()); + }else{ macroLibraries.put("treeData", treeJson); }