正在显示
3 个修改的文件
包含
11 行增加
和
7 行删除
| @@ -228,7 +228,7 @@ export default { | @@ -228,7 +228,7 @@ export default { | ||
| 228 | reset() { | 228 | reset() { |
| 229 | this.form = { | 229 | this.form = { |
| 230 | deptId: undefined, | 230 | deptId: undefined, |
| 231 | - parentId: 100, | 231 | + parentId: undefined, |
| 232 | deptName: undefined, | 232 | deptName: undefined, |
| 233 | orderNum: undefined, | 233 | orderNum: undefined, |
| 234 | leader: undefined, | 234 | leader: undefined, |
| @@ -135,9 +135,9 @@ | @@ -135,9 +135,9 @@ | ||
| 135 | <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> | 135 | <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange"> |
| 136 | <el-table-column type="selection" width="40" align="center" /> | 136 | <el-table-column type="selection" width="40" align="center" /> |
| 137 | <el-table-column label="用户编号" align="center" prop="userId" /> | 137 | <el-table-column label="用户编号" align="center" prop="userId" /> |
| 138 | - <el-table-column label="用户名称" align="center" prop="userName" /> | ||
| 139 | - <el-table-column label="用户昵称" align="center" prop="nickName" /> | ||
| 140 | - <el-table-column label="部门" align="center" prop="dept.deptName" /> | 138 | + <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" /> |
| 139 | + <el-table-column label="用户昵称" align="center" prop="nickName" :show-overflow-tooltip="true" /> | ||
| 140 | + <el-table-column label="部门" align="center" prop="dept.deptName" :show-overflow-tooltip="true" /> | ||
| 141 | <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" /> | 141 | <el-table-column label="手机号码" align="center" prop="phonenumber" width="120" /> |
| 142 | <el-table-column label="状态" align="center"> | 142 | <el-table-column label="状态" align="center"> |
| 143 | <template slot-scope="scope"> | 143 | <template slot-scope="scope"> |
| @@ -502,7 +502,7 @@ export default { | @@ -502,7 +502,7 @@ export default { | ||
| 502 | reset() { | 502 | reset() { |
| 503 | this.form = { | 503 | this.form = { |
| 504 | userId: undefined, | 504 | userId: undefined, |
| 505 | - deptId: 100, | 505 | + deptId: undefined, |
| 506 | userName: undefined, | 506 | userName: undefined, |
| 507 | nickName: undefined, | 507 | nickName: undefined, |
| 508 | password: undefined, | 508 | password: undefined, |
| @@ -49,11 +49,15 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -49,11 +49,15 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 49 | public List<SysDept> buildDeptTree(List<SysDept> depts) | 49 | public List<SysDept> buildDeptTree(List<SysDept> depts) |
| 50 | { | 50 | { |
| 51 | List<SysDept> returnList = new ArrayList<SysDept>(); | 51 | List<SysDept> returnList = new ArrayList<SysDept>(); |
| 52 | + if (StringUtils.isNotEmpty(depts) && StringUtils.isNotNull(depts.stream().findFirst())) | ||
| 53 | + { | ||
| 54 | + depts.stream().findFirst().get().setParentId(null); | ||
| 55 | + } | ||
| 52 | for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();) | 56 | for (Iterator<SysDept> iterator = depts.iterator(); iterator.hasNext();) |
| 53 | { | 57 | { |
| 54 | SysDept t = (SysDept) iterator.next(); | 58 | SysDept t = (SysDept) iterator.next(); |
| 55 | // 根据传入的某个父节点ID,遍历该父节点的所有子节点 | 59 | // 根据传入的某个父节点ID,遍历该父节点的所有子节点 |
| 56 | - if (t.getParentId() == 0) | 60 | + if (StringUtils.isNull(t.getParentId()) || t.getParentId() == 0) |
| 57 | { | 61 | { |
| 58 | recursionFn(depts, t); | 62 | recursionFn(depts, t); |
| 59 | returnList.add(t); | 63 | returnList.add(t); |
| @@ -271,7 +275,7 @@ public class SysDeptServiceImpl implements ISysDeptService | @@ -271,7 +275,7 @@ public class SysDeptServiceImpl implements ISysDeptService | ||
| 271 | while (it.hasNext()) | 275 | while (it.hasNext()) |
| 272 | { | 276 | { |
| 273 | SysDept n = (SysDept) it.next(); | 277 | SysDept n = (SysDept) it.next(); |
| 274 | - if (n.getParentId().longValue() == t.getDeptId().longValue()) | 278 | + if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) |
| 275 | { | 279 | { |
| 276 | tlist.add(n); | 280 | tlist.add(n); |
| 277 | } | 281 | } |
-
请 注册 或 登录 后发表评论