Просмотр исходного кода

获取部门及用户树列表新版

chenshudong недель назад: 2
Родитель
Сommit
aa275c4d56

+ 0 - 5
airport-common/src/main/java/com/sundot/airport/common/core/domain/DeptAndUserTreeSelect.java

@@ -53,11 +53,6 @@ public class DeptAndUserTreeSelect {
53
     private String deptType;
53
     private String deptType;
54
 
54
 
55
     /**
55
     /**
56
-     * 部门用户列表
57
-     */
58
-    private List<DeptAndUserTreeSelect> userList;
59
-
60
-    /**
61
      * 子节点
56
      * 子节点
62
      */
57
      */
63
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
58
     @JsonInclude(JsonInclude.Include.NON_EMPTY)

+ 1 - 1
airport-system/src/main/java/com/sundot/airport/system/service/impl/SysDeptServiceImpl.java

@@ -836,7 +836,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
836
             List<DeptAndUserTreeSelect> userChildren = users.stream()
836
             List<DeptAndUserTreeSelect> userChildren = users.stream()
837
                     .map(DeptAndUserTreeSelect::new)
837
                     .map(DeptAndUserTreeSelect::new)
838
                     .collect(Collectors.toList());
838
                     .collect(Collectors.toList());
839
-            treeSelect.setUserList(userChildren);
839
+            children.addAll(userChildren);
840
         }
840
         }
841
 
841
 
842
         if (!children.isEmpty()) {
842
         if (!children.isEmpty()) {