From b7a60f6b9e9b99b0285ceb41c60c4c9ae6c0355d Mon Sep 17 00:00:00 2001
From: Administrator <704728292@qq.com>
Date: Wed, 21 Feb 2024 17:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84=E5=9B=BE?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=AF=B9=E5=85=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/sship/entity/DropTreeDataVO.java      |  4 ++--
 .../sship/service/impl/OrgChartServiceImpl.java      | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/sship/entity/DropTreeDataVO.java b/src/com/engine/sship/entity/DropTreeDataVO.java
index cdc028e..ca9d6bb 100644
--- a/src/com/engine/sship/entity/DropTreeDataVO.java
+++ b/src/com/engine/sship/entity/DropTreeDataVO.java
@@ -17,11 +17,11 @@ import java.util.List;
 @NoArgsConstructor
 public class DropTreeDataVO {
 
-    private String id;
+    private String value;
 
     private String label;
 
-    private List<DropTreeDataVO> childrens;
+    private List<DropTreeDataVO> children;
 
 
 }
diff --git a/src/com/engine/sship/service/impl/OrgChartServiceImpl.java b/src/com/engine/sship/service/impl/OrgChartServiceImpl.java
index 32bb274..bb87634 100644
--- a/src/com/engine/sship/service/impl/OrgChartServiceImpl.java
+++ b/src/com/engine/sship/service/impl/OrgChartServiceImpl.java
@@ -184,11 +184,11 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             while (rs.next()) {
                 String id = Util.null2String(rs.getString("id"));
                 DropTreeDataVO build = DropTreeDataVO.builder()
-                        .id(getRandomData()+id)
+                        .value(getRandomData()+id)
                         .label(Util.null2String(rs.getString("departmentmark")))
                         .build();
                 if (isVirtualSubDepartment(id,virtualType)) {
-                    build.setChildrens(getVirtualSubDeptData(id,virtualType));
+                    build.setChildren(getVirtualSubDeptData(id,virtualType));
                 }
                 voList.add(build);
             }
@@ -281,11 +281,11 @@ public List<DropTreeDataVO> selectVirtualTopTwo(String virtualType) {
         rs.next();
         String id = Util.null2String(rs.getString("id"));
         build = DropTreeDataVO.builder()
-                .id(getRandomData()+id)
+                .value(getRandomData()+id)
                 .label(Util.null2String(rs.getString("departmentmark")))
                 .build();
         if (isVirtualSubDepartment(id,virtualType)) {
-            build.setChildrens(getVirtualSubDeptData(id,virtualType));
+            build.setChildren(getVirtualSubDeptData(id,virtualType));
         }
         dataVOS.add(build);
 
@@ -297,11 +297,11 @@ public List<DropTreeDataVO> selectVirtualTopTwo(String virtualType) {
         rs.executeQuery("select departmentmark from hrmdepartmentvirtual where id = ? and virtualtype = ? order by showorder",departmentId,virtualType);
         rs.next();
         build = DropTreeDataVO.builder()
-                .id(getRandomData()+departmentId)
+                .value(getRandomData()+departmentId)
                 .label(Util.null2String(rs.getString("departmentmark")))
                 .build();
         if (isVirtualSubDepartment(departmentId,virtualType)) {
-            build.setChildrens(getVirtualSubDeptData(departmentId,virtualType));
+            build.setChildren(getVirtualSubDeptData(departmentId,virtualType));
         }
         dataVOS.add(build);