From 7cddb1f63f71eb92510a14bff69394f0ee986381 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@gmail.com>
Date: Tue, 3 Aug 2021 13:46:08 +0800
Subject: [PATCH] =?UTF-8?q?:recycle:=20Refactoring=20code.=20closed=20#302?=
 =?UTF-8?q?6=20=E3=80=90=E9=87=8D=E6=9E=84=E3=80=91=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=BD=BF=E7=94=A8=E8=A1=A8=E6=A0=BC=E6=A0=91?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pigx/admin/service/impl/SysDeptServiceImpl.java | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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 64c25fc33..d0ba0d59f 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
@@ -23,7 +23,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNode;
 import cn.hutool.core.lang.tree.TreeUtil;
-import cn.hutool.core.map.MapUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.entity.SysDept;
@@ -38,7 +37,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Comparator;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -59,6 +60,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
 	/**
 	 * 添加信息部门
+	 *
 	 * @param dept 部门
 	 * @return
 	 */
@@ -74,6 +76,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
 	/**
 	 * 删除部门
+	 *
 	 * @param id 部门 ID
 	 * @return 成功、失败
 	 */
@@ -96,6 +99,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
 	/**
 	 * 更新部门
+	 *
 	 * @param sysDept 部门信息
 	 * @return 成功、失败
 	 */
@@ -114,6 +118,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
 	/**
 	 * 查询全部部门树
+	 *
 	 * @return 树
 	 */
 	@Override
@@ -132,8 +137,12 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 					treeNode.setId(dept.getDeptId());
 					treeNode.setParentId(dept.getParentId());
 					treeNode.setName(dept.getName());
+					treeNode.setWeight(dept.getSort());
 					// 有权限不返回标识
-					treeNode.setExtra(MapUtil.of("isLock", !deptOwnIdList.contains(dept.getDeptId())));
+					Map<String, Object> extra = new HashMap<>(8);
+					extra.put("isLock", !deptOwnIdList.contains(dept.getDeptId()));
+					extra.put("createTime", dept.getCreateTime());
+					treeNode.setExtra(extra);
 					return treeNode;
 				}).collect(Collectors.toList());