From 98b851adc273fab28b2a2abdfcf418da5d5f18c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=B7=E5=86=B7?= Date: Sun, 31 Mar 2019 13:07:02 +0800 Subject: [PATCH] =?UTF-8?q?:bookmark:=20Releasing=20/=20Version=20tags.=20?= =?UTF-8?q?2.7.0=20=E9=85=8D=E5=90=88=E5=89=8D=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pigx/admin/controller/DeptController.java | 10 ----- .../pigx/admin/mapper/SysDeptMapper.java | 8 ---- .../pigx/admin/service/SysDeptService.java | 7 --- .../service/impl/SysDeptServiceImpl.java | 44 ++++++------------- .../main/resources/mapper/SysDeptMapper.xml | 24 ---------- 5 files changed, 13 insertions(+), 80 deletions(-) diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java index 28d952fc5..9570d3562 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java @@ -68,16 +68,6 @@ public class DeptController { return new R<>(sysDeptService.selectTree()); } - /** - * 返回当前用户树形菜单集合 - * - * @return 树形菜单 - */ - @GetMapping(value = "/user-tree") - public R getUserTree() { - return new R<>(sysDeptService.getUserTree()); - } - /** * 添加 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java index 6df92577f..aeb1e4ae5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java @@ -22,8 +22,6 @@ package com.pig4cloud.pigx.admin.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysDept; -import java.util.List; - /** *

* 部门管理 Mapper 接口 @@ -34,10 +32,4 @@ import java.util.List; */ public interface SysDeptMapper extends BaseMapper { - /** - * 关联dept——relation - * - * @return 数据列表 - */ - List listDepts(); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java index d7cffea73..54417a797 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java @@ -42,13 +42,6 @@ public interface SysDeptService extends IService { */ List selectTree(); - /** - * 查询用户部门树 - * - * @return - */ - List getUserTree(); - /** * 添加信息部门 * 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 db853a5fc..82bc07eab 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 @@ -29,7 +29,6 @@ import com.pig4cloud.pigx.admin.api.vo.TreeUtil; import com.pig4cloud.pigx.admin.mapper.SysDeptMapper; import com.pig4cloud.pigx.admin.service.SysDeptRelationService; import com.pig4cloud.pigx.admin.service.SysDeptService; -import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -79,11 +78,11 @@ public class SysDeptServiceImpl extends ServiceImpl impl public Boolean removeDeptById(Integer id) { //级联删除部门 List idList = sysDeptRelationService - .list(Wrappers.query().lambda() - .eq(SysDeptRelation::getAncestor, id)) - .stream() - .map(SysDeptRelation::getDescendant) - .collect(Collectors.toList()); + .list(Wrappers.query().lambda() + .eq(SysDeptRelation::getAncestor, id)) + .stream() + .map(SysDeptRelation::getDescendant) + .collect(Collectors.toList()); if (CollUtil.isNotEmpty(idList)) { this.removeByIds(idList); @@ -123,23 +122,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl return getDeptTree(this.list(Wrappers.emptyWrapper())); } - /** - * 查询用户部门树 - * - * @return - */ - @Override - public List getUserTree() { - Integer deptId = SecurityUtils.getUser().getDeptId(); - List descendantIdList = sysDeptRelationService - .list(Wrappers.query().lambda() - .eq(SysDeptRelation::getAncestor, deptId)) - .stream().map(SysDeptRelation::getDescendant) - .collect(Collectors.toList()); - - List deptList = baseMapper.selectBatchIds(descendantIdList); - return getDeptTree(deptList); - } /** * 构建部门树 @@ -149,14 +131,14 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ private List getDeptTree(List depts) { List treeList = depts.stream() - .filter(dept -> !dept.getDeptId().equals(dept.getParentId())) - .map(dept -> { - DeptTree node = new DeptTree(); - node.setId(dept.getDeptId()); - node.setParentId(dept.getParentId()); - node.setName(dept.getName()); - return node; - }).collect(Collectors.toList()); + .filter(dept -> !dept.getDeptId().equals(dept.getParentId())) + .map(dept -> { + DeptTree node = new DeptTree(); + node.setId(dept.getDeptId()); + node.setParentId(dept.getParentId()); + node.setName(dept.getName()); + return node; + }).collect(Collectors.toList()); return TreeUtil.build(treeList, 0); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml index 667c55728..7f0befa96 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDeptMapper.xml @@ -21,28 +21,4 @@ - - - - - - - - - - - - - dept_id AS deptId, parent_id AS parentId, name, sort, create_time AS createTime, update_time AS updateTime, del_flag AS delFlag - - - -