关联表单数据调整

src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java

@@ -59,7 +59,7 @@ public class AssociatedFormsController {
     /*获取系统角色列表*/
     @RequestMapping(value = "AssociatedForms/getRoleList")
     public JsonData getRoleList() {
-        ArrayList<SystemRole> serviceRoleList = customerFormService.getRoleList();
+        Tree serviceRoleList = customerFormService.getRoleList();
         return JsonData.buildSuccess(serviceRoleList);
     }
 

src/main/java/com/hxgk/lowcode/service/CustomerFormService.java

@@ -12,5 +12,5 @@ public interface CustomerFormService {
 
     Tree getFieldTree(String key,String token,String cfid);
 
-    ArrayList<SystemRole> getRoleList();
+    Tree getRoleList();
 }

src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java

@@ -225,7 +225,7 @@ public class CustomerFormServiceImpl implements CustomerFormService {
                 if(code.toString().equals("0")){
                     JsonNode data = jsonNode.get("data");
 
-                    tree.setId(cfid);
+                    tree.setId("formField:"+cfid);
                     tree.setLabel(cfid);
                     ArrayNode masterTableArr = (ArrayNode) data.get("masterTable");
                     JsonNode sunTableArrObj = data.get("sunTable");
@@ -369,11 +369,22 @@ public class CustomerFormServiceImpl implements CustomerFormService {
     }
 
     @Override
-    public ArrayList<SystemRole> getRoleList() {
+    public Tree getRoleList() {
-
+        Tree tree = new Tree();
+        tree.setId("roleid:"+"rootid");
+        tree.setLabel("角色");
         //得到所有启用的系统角色(state=1的)
         ArrayList<SystemRole> roleList = systemRoleService.getAllRole();
-        return roleList;
+        ArrayList<Tree> tree1List = new ArrayList<>();
+        for(SystemRole systemRole:roleList){
+            Tree tree1 = new Tree();
+            tree1.setId(tree.getId()+":"+systemRole.getId());
+            tree1.setLabel((systemRole.getName()));
+            tree1.setParentId(tree.getId());
+            tree1List.add(tree1);
+        }
+        tree.setChildren(tree1List);
+        return tree;
     }