From 6bf616cda02946f58e7e3ee1f23db937276d7f7c Mon Sep 17 00:00:00 2001 From: torvalds Date: Thu, 14 May 2020 20:16:13 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20Fixing=20a=20bug.=20#1209=20=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=94=A8=E6=88=B7=20=E7=99=BB=E5=BD=95=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E5=92=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E7=94=A8=E6=88=B7=E6=97=B6=EF=BC=8C=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E9=83=A8=E9=97=A8=E6=A0=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index 5e7f5025d..6377a7304 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -143,6 +143,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl node.setName(dept.getName()); return node; }).collect(Collectors.toList()); - return TreeUtil.build(treeList, 0); + return TreeUtil.build(treeList, depts.stream() + .sorted(Comparator.comparingInt(SysDept::getDeptId)) + .findFirst().get().getParentId()); } }