From d752c30505f13bfb4061816885948e9e15bbe3c2 Mon Sep 17 00:00:00 2001
From: liwenxuan <1298531568@qq.com>
Date: Thu, 18 Apr 2024 10:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=A1=A8=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AssociatedFormsController.java |  2 +-
 .../lowcode/service/CustomerFormService.java  |  2 +-
 .../service/impl/CustomerFormServiceImpl.java | 19 +++++++++++++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java b/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java
index a85d75c..1386915 100644
--- a/src/main/java/com/hxgk/lowcode/controller/AssociatedFormsController.java
+++ b/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);
     }
 
diff --git a/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java b/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java
index dac6e3e..e54434b 100644
--- a/src/main/java/com/hxgk/lowcode/service/CustomerFormService.java
+++ b/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();
 }
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 43e1859..3095608 100644
--- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java
+++ b/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;
     }