From 3755597c760fc5f2896d02d5be871587abca547a Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 26 Dec 2019 15:59:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=80=E4=B8=AA=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E7=A9=BA=E5=B1=9E=E6=80=A7=EF=BC=8C=E7=94=A8=E6=9D=A5?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E8=8A=82=E7=82=B9=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/dept/index.vue                  | 2 +-
 ruoyi-ui/src/views/system/user/index.vue                  | 8 ++++----
 .../project/system/service/impl/SysDeptServiceImpl.java   | 8 ++++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index bcefdb879..3029913f9 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -228,7 +228,7 @@ export default {
     reset() {
       this.form = {
         deptId: undefined,
-        parentId: 100,
+        parentId: undefined,
         deptName: undefined,
         orderNum: undefined,
         leader: undefined,
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index aae3e82b2..d2cdb84a8 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -135,9 +135,9 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="40" align="center" />
           <el-table-column label="用户编号" align="center" prop="userId" />
-          <el-table-column label="用户名称" align="center" prop="userName" />
-          <el-table-column label="用户昵称" align="center" prop="nickName" />
-          <el-table-column label="部门" align="center" prop="dept.deptName" />
+          <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
+          <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
+          <el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" />
           <el-table-column label="状态" align="center">
             <template slot-scope="scope">
@@ -502,7 +502,7 @@ export default {
     reset() {
       this.form = {
         userId: undefined,
-        deptId: 100,
+        deptId: undefined,
         userName: undefined,
         nickName: undefined,
         password: undefined,
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
index f4e4decfe..cc51d49b2 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
@@ -49,11 +49,15 @@ public class SysDeptServiceImpl implements ISysDeptService
     public List<SysDept> buildDeptTree(List<SysDept> depts)
     {
         List<SysDept> returnList = new ArrayList<SysDept>();
+        if (StringUtils.isNotEmpty(depts) && StringUtils.isNotNull(depts.stream().findFirst()))
+        {
+            depts.stream().findFirst().get().setParentId(null);
+        }
         for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
         {
             SysDept t = (SysDept) iterator.next();
             // 根据传入的某个父节点ID,遍历该父节点的所有子节点
-            if (t.getParentId() == 0)
+            if (StringUtils.isNull(t.getParentId()) || t.getParentId() == 0)
             {
                 recursionFn(depts, t);
                 returnList.add(t);
@@ -271,7 +275,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         while (it.hasNext())
         {
             SysDept n = (SysDept) it.next();
-            if (n.getParentId().longValue() == t.getDeptId().longValue())
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
             {
                 tlist.add(n);
             }