yili/apps
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'apps_dev' of https://e.coding.net/yilidev/yilipalkaifa/apps into apps_dev

Browse Source
This commit is contained in:
3120626891@qq.com 2022-07-27 14:14:57 +08:00
commit fdfa97cca1
2 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
com.actionsoft.apps.coe.pal/lib/com.actionsoft.apps.coe.pal.jar
View File

Binary file not shown.

27
com.actionsoft.apps.coe.pal/src/com/actionsoft/apps/coe/pal/pal/repository/designer/relation/web/DesignerRelationShapeWeb.java
View File

@ -768,6 +768,8 @@ public class DesignerRelationShapeWeb extends ActionWeb {
String url = jsonObject.getString("url"); String url = jsonObject.getString("url");
String id = jsonObject.getString("id"); String id = jsonObject.getString("id");
System.out.println("Jsonobject=========="+jsonObject);
System.out.println("url======================"+url);
if (UtilString.isNotEmpty(url)) { if (UtilString.isNotEmpty(url)) {
List data=new ArrayList(); List data=new ArrayList();
data.add(0,jsonObject.getString("plMethodId")); data.add(0,jsonObject.getString("plMethodId"));
@ -782,36 +784,13 @@ public class DesignerRelationShapeWeb extends ActionWeb {
} }
} }
macroLibraries.put("treeData", jsonArr_new.toString()); 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<Map<String, Object>> 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")){ } else if(attrId.equals("post")){
if (objects != null) { if (objects != null) {
for (int i = 0; i < objects.size(); i++) { for (int i = 0; i < objects.size(); i++) {
String id= objects.getJSONObject(i).getString("id"); String id= objects.getJSONObject(i).getString("id");
String url =objects.getJSONObject(i).getString("url"); String url =objects.getJSONObject(i).getString("url");
/*String titles=objects.getJSONObject(i).getString("title");
if(!titles.equals("岗位模型") && titles!=null){*/
if (UtilString.isNotEmpty(url)) { if (UtilString.isNotEmpty(url)) {
String titles=objects.getJSONObject(i).getString("title"); String titles=objects.getJSONObject(i).getString("title");
if(titles.equals("岗位模型")){ if(titles.equals("岗位模型")){
@ -829,8 +808,6 @@ public class DesignerRelationShapeWeb extends ActionWeb {
}else{ }else{
jsonArr_new.add(objects.getJSONObject(i)); jsonArr_new.add(objects.getJSONObject(i));
} }
/*}*/
} }
} }
macroLibraries.put("treeData", jsonArr_new.toString()); macroLibraries.put("treeData", jsonArr_new.toString());