From f68f4824cd8931af424540f86dab2fa6f208eb43 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Mon, 30 Aug 2021 15:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E9=97=A8=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=91=E6=8E=92=E9=99=A4=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/system/SysDeptController.java | 2 +- .../common/core/domain/entity/SysDept.java | 19 ++++++++++++++++++- .../service/impl/SysDeptServiceImpl.java | 6 +++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java index c8b7bb98b..720a4ef68 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java @@ -189,7 +189,7 @@ public class SysDeptController extends BaseController public List treeDataExcludeChild(@PathVariable(value = "excludeId", required = false) Long excludeId) { SysDept dept = new SysDept(); - dept.setDeptId(excludeId); + dept.setExcludeId(excludeId); List ztrees = deptService.selectDeptTreeExcludeChild(dept); return ztrees; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index e8530a9cf..89f64e4a6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -1,8 +1,11 @@ package com.ruoyi.common.core.domain.entity; -import javax.validation.constraints.*; +import javax.validation.constraints.Email; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.ruoyi.common.core.domain.BaseEntity; /** @@ -47,6 +50,9 @@ public class SysDept extends BaseEntity /** 父部门名称 */ private String parentName; + /** 排除编号 */ + private Long excludeId; + public Long getDeptId() { return deptId; @@ -163,6 +169,17 @@ public class SysDept extends BaseEntity this.parentName = parentName; } + @JsonIgnore + public Long getExcludeId() + { + return excludeId; + } + + public void setExcludeId(Long excludeId) + { + this.excludeId = excludeId; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 0ef529dfa..932ed4692 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -70,14 +70,14 @@ public class SysDeptServiceImpl implements ISysDeptService @DataScope(deptAlias = "d") public List selectDeptTreeExcludeChild(SysDept dept) { - Long deptId = dept.getDeptId(); + Long excludeId = dept.getExcludeId(); List deptList = deptMapper.selectDeptList(dept); Iterator it = deptList.iterator(); while (it.hasNext()) { SysDept d = (SysDept) it.next(); - if (d.getDeptId().intValue() == deptId - || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) + if (d.getDeptId().intValue() == excludeId + || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), excludeId + "")) { it.remove(); }