diff --git a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar index 7c8378f9..37c25d26 100644 Binary files a/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar and b/com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar differ 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 94c4017a..a9791f56 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 @@ -768,6 +768,8 @@ public class DesignerRelationShapeWeb extends ActionWeb { String url = jsonObject.getString("url"); String id = jsonObject.getString("id"); + System.out.println("Jsonobject=========="+jsonObject); + System.out.println("url======================"+url); if (UtilString.isNotEmpty(url)) { List data=new ArrayList(); data.add(0,jsonObject.getString("plMethodId")); @@ -782,36 +784,13 @@ public class DesignerRelationShapeWeb extends ActionWeb { } } macroLibraries.put("treeData", jsonArr_new.toString()); - }else if(attrId.equals("R_relevant_flies")){ - 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 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"); - /*String titles=objects.getJSONObject(i).getString("title"); - if(!titles.equals("岗位模型") && titles!=null){*/ if (UtilString.isNotEmpty(url)) { String titles=objects.getJSONObject(i).getString("title"); if(titles.equals("岗位模型")){ @@ -829,8 +808,6 @@ public class DesignerRelationShapeWeb extends ActionWeb { }else{ jsonArr_new.add(objects.getJSONObject(i)); } - /*}*/ - } } macroLibraries.put("treeData", jsonArr_new.toString());