WangZhiJian/cxxm
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加一个默认空属性，用来判断节点显示

Browse Source
This commit is contained in:
RuoYi 2019-12-26 15:59:03 +08:00
parent 71c31dfd66
commit 3755597c76
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/system/dept/index.vue
View File

@ -228,7 +228,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
deptId: undefined, deptId: undefined,
parentId: 100, parentId: undefined,
deptName: undefined, deptName: undefined,
orderNum: undefined, orderNum: undefined,
leader: undefined, leader: undefined,

8
ruoyi-ui/src/views/system/user/index.vue
View File

@ -135,9 +135,9 @@
<el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="40" align="center" /> <el-table-column type="selection" width="40" align="center" />
<el-table-column label="用户编号" align="center" prop="userId" /> <el-table-column label="用户编号" align="center" prop="userId" />
<el-table-column label="用户名称" align="center" prop="userName" /> <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" />
<el-table-column label="用户昵称" align="center" prop="nickName" /> <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" />
<el-table-column label="部门" align="center" prop="dept.deptName" /> <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" prop="phonenumber" width="120" />
<el-table-column label="状态" align="center"> <el-table-column label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -502,7 +502,7 @@ export default {
reset() { reset() {
this.form = { this.form = {
userId: undefined, userId: undefined,
deptId: 100, deptId: undefined,
userName: undefined, userName: undefined,
nickName: undefined, nickName: undefined,
password: undefined, password: undefined,

8
ruoyi/src/main/java/com/ruoyi/project/system/service/impl/SysDeptServiceImpl.java
View File

@ -49,11 +49,15 @@ public class SysDeptServiceImpl implements ISysDeptService
public List<SysDept> buildDeptTree(List<SysDept> depts) public List<SysDept> buildDeptTree(List<SysDept> depts)
{ {
List<SysDept> returnList = new ArrayList<SysDept>(); 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();) for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();)
{ {
SysDept t = (SysDept) iterator.next(); SysDept t = (SysDept) iterator.next();
// 根据传入的某个父节点ID,遍历该父节点的所有子节点 // 根据传入的某个父节点ID,遍历该父节点的所有子节点
if (t.getParentId() == 0) if (StringUtils.isNull(t.getParentId()) || t.getParentId() == 0)
{ {
recursionFn(depts, t); recursionFn(depts, t);
returnList.add(t); returnList.add(t);
@ -271,7 +275,7 @@ public class SysDeptServiceImpl implements ISysDeptService
while (it.hasNext()) while (it.hasNext())
{ {
SysDept n = (SysDept) it.next(); 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); tlist.add(n);
} }