组织架构图根节点查询返回体调整

src/com/engine/sship/entity/DropTreeDataVO.java

@@ -0,0 +1,27 @@
+package com.engine.sship.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+/**
+ * @author xxy
+ */
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class DropTreeDataVO {
+
+    private String id;
+
+    private String label;
+
+    private List<DropTreeDataVO> childrens;
+
+
+}

src/com/engine/sship/service/OrgChartService.java

@@ -94,7 +94,7 @@ public interface OrgChartService {
     * @param: [virtualType]
     * @return: java.util.List<com.engine.sship.entity.TreeDataVO>
     */
-   TreeDataVO selectVirtualTopTwo(String virtualType);
+   List<DropTreeDataVO> selectVirtualTopTwo(String virtualType);
 
 
  /**

src/com/engine/sship/service/impl/OrgChartServiceImpl.java

@@ -177,14 +177,13 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         return voList;
     }
 
-        private List<ChartChildrensVO> getVirtualSubDeptData(String supdepid,String virtualType) {
+        private List<DropTreeDataVO> getVirtualSubDeptData(String supdepid,String virtualType) {
             RecordSet rs = new RecordSet();
-            List<ChartChildrensVO> voList = new ArrayList<>();
+            List<DropTreeDataVO> voList = new ArrayList<>();
             rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid <> '' and supdepid = ? and virtualtype = ? order by showorder",supdepid,virtualType);
             while (rs.next()) {
                 String id = Util.null2String(rs.getString("id"));
-                ChartChildrensVO build = ChartChildrensVO.builder()
+                DropTreeDataVO build = DropTreeDataVO.builder()
-                        .pid(supdepid)
                         .id(getRandomData()+id)
                         .label(Util.null2String(rs.getString("departmentmark")))
                         .build();
@@ -268,10 +267,11 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
     }
 
 @Override
-public TreeDataVO selectVirtualTopTwo(String virtualType) {
+public List<DropTreeDataVO> selectVirtualTopTwo(String virtualType) {
     RecordSet rs = new RecordSet();
     BaseBean bb = new BaseBean();
-    TreeDataVO build;
+    List<DropTreeDataVO> dataVOS = new ArrayList<>();
+    DropTreeDataVO build;
     String roleId = bb.getPropValue("sship", "roleId");
     String rolelevel = bb.getPropValue("sship", "rolelevel");
     boolean isExsit = selectIdsByRole(roleId, rolelevel);
@@ -280,13 +280,14 @@ public TreeDataVO selectVirtualTopTwo(String virtualType) {
         rs.executeQuery("select id,departmentmark from hrmdepartmentvirtual where supdepid = 0 and virtualtype = ? order by showorder",virtualType);
         rs.next();
         String id = Util.null2String(rs.getString("id"));
-        build = TreeDataVO.builder()
+        build = DropTreeDataVO.builder()
                 .id(getRandomData()+id)
                 .label(Util.null2String(rs.getString("departmentmark")))
                 .build();
         if (isVirtualSubDepartment(id,virtualType)) {
             build.setChildrens(getVirtualSubDeptData(id,virtualType));
         }
+        dataVOS.add(build);
 
     } else {
         //获取当前部门
@@ -295,16 +296,17 @@ public TreeDataVO selectVirtualTopTwo(String virtualType) {
         String departmentId = Util.null2String(rs.getString("departmentid"));
         rs.executeQuery("select departmentmark from hrmdepartmentvirtual where id = ? and virtualtype = ? order by showorder",departmentId,virtualType);
         rs.next();
-        build = TreeDataVO.builder()
+        build = DropTreeDataVO.builder()
                 .id(getRandomData()+departmentId)
                 .label(Util.null2String(rs.getString("departmentmark")))
                 .build();
         if (isVirtualSubDepartment(departmentId,virtualType)) {
             build.setChildrens(getVirtualSubDeptData(departmentId,virtualType));
         }
+        dataVOS.add(build);
 
     }
-    return build;
+    return dataVOS;
 }
 
     @Override

src/com/engine/sship/web/OrgChartController.java

@@ -82,7 +82,7 @@ public class OrgChartController {
     @Produces(MediaType.APPLICATION_JSON)
     public String selectVirtualTopTwo(@Context HttpServletRequest request, @Context HttpServletResponse response,@QueryParam("virtualType") String virtualType) {
         User user = HrmUserVarify.getUser(request, response);
-        return new ResponseResult<String, TreeDataVO>(user).run(getOrgChartService(user) :: selectVirtualTopTwo,virtualType);
+        return new ResponseResult<String, List<DropTreeDataVO>>(user).run(getOrgChartService(user) :: selectVirtualTopTwo,virtualType);
     }
     @GET
     @Path("/virtual-top-three")