diff --git a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java index 1386915..ebb3f67 100644 --- a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java +++ b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java @@ -51,6 +51,9 @@ public class AssociatedFormsController { if(tree.getId()==null){ return JsonData.buildError("查无此表单"); }else{ + if(tree.getId().equals("cfid为空")){ + return JsonData.buildSuccess(tree); + } return JsonData.buildSuccess(tree); } diff --git a/src/main/java/com/hxgk/lowcode/model/entity/Tree.java b/src/main/java/com/hxgk/lowcode/model/entity/Tree.java index bd9865f..d9a30ff 100644 --- a/src/main/java/com/hxgk/lowcode/model/entity/Tree.java +++ b/src/main/java/com/hxgk/lowcode/model/entity/Tree.java @@ -12,6 +12,7 @@ public class Tree { private String label; private String parentId; private List children; + private String value; private HashMap treeAttrs; @@ -55,4 +56,12 @@ public class Tree { public void setTreeAttrs(HashMap treeAttrs) { this.treeAttrs = treeAttrs; } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java index 1bf126c..aaa999d 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -59,7 +59,8 @@ public class CustomerFormServiceImpl implements CustomerFormService { Tree tree = new Tree(); tree.setId("rootid"); - tree.setLabel("选择表单"); + tree.setLabel("请选择表单"); + tree.setValue("rootvalue"); //筛选出所有表单中,当前用户有权限的表单 for(CustomerForm c:customerFormList){ @@ -157,6 +158,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { tree1.setId(item.getId()); tree1.setParentId(tree.getId()); tree1.setLabel(item.getName()); + tree1.setValue(item.getId()); HashMap treeAttrs = new HashMap<>(); treeAttrs.put("version",item.getVersion().toString()); tree1.setTreeAttrs(treeAttrs); @@ -175,6 +177,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { tree2.setLabel(l); tree2.setParentId(tree1.getId()); tree2.setId("zibiaoid-"+l); + tree2.setValue(tree2.getId()); treeArrayList.add(tree2); } @@ -190,9 +193,12 @@ public class CustomerFormServiceImpl implements CustomerFormService { @Override public Tree getFieldTree(String key,String token,String cfid) { + Boolean flag = StringUtils.isBlank(cfid); + System.out.println(StringUtils.isBlank(cfid)); Tree tree = new Tree(); if(StringUtils.isBlank(key)||StringUtils.isBlank(token)||StringUtils.isBlank(cfid)){ //参数不全不能发送请求. + tree.setId("cfid为空"); }else{ Boolean sunFlag = false; //子表列表 @@ -226,10 +232,10 @@ public class CustomerFormServiceImpl implements CustomerFormService { JsonNode data = jsonNode.get("data"); tree.setId("formField:"+cfid); - tree.setLabel(cfid); + tree.setLabel("表单-"+cfid); HashMap showMap = new HashMap<>(); - showMap.put("show",cfid); + showMap.put("show","表单-"+cfid); tree.setTreeAttrs(showMap); ArrayNode masterTableArr = (ArrayNode) data.get("masterTable");