From ae15bcfa00be552b79adc957c875ad2074ca7fb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Mon, 13 Apr 2020 18:16:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java | 4 ++++ .../java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java | 5 +++++ .../main/java/com/elink/esua/epdc/entity/AppMenuEntity.java | 5 +++++ .../com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java | 5 +++++ .../src/main/resources/mapper/SysAnalysisMenuDao.xml | 1 + 5 files changed, 20 insertions(+) diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java index 7f0cd1e00..beb5bc8cd 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/AppMenuDTO.java @@ -132,4 +132,8 @@ public class AppMenuDTO extends TreeNode implements Serializable { * 上级菜单名称 */ private String parentName; + /** + * 绑定菜单id + */ + private Long bindingId; } diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java index c06629052..ca85e22e3 100644 --- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/SysAnalysisMenuDTO.java @@ -137,5 +137,10 @@ public class SysAnalysisMenuDTO implements Serializable { */ private String modelname; + /** + * 绑定菜单id + */ + private Long bindingId; + } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java index 00b42d0df..4622f8f43 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/AppMenuEntity.java @@ -116,4 +116,9 @@ public class AppMenuEntity extends BaseEntity { */ private String numFlag; + /** + * 绑定菜单id + */ + private Long bindingId; + } diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java index ac45ced4b..7cb3a3976 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/entity/SysAnalysisMenuEntity.java @@ -117,4 +117,9 @@ public class SysAnalysisMenuEntity extends BaseEntity { */ private String numFlag; + /** + * 绑定菜单id + */ + private Long bindingId; + } \ No newline at end of file diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml index 649e12cdf..8c036b699 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysAnalysisMenuDao.xml @@ -20,6 +20,7 @@ + + From 9e322eecd3e6f2cc679b123aab1584fc7f86b651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Wed, 15 Apr 2020 11:08:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java | 5 +++++ .../com/elink/esua/epdc/service/impl/SysRoleServiceImpl.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java index 4c7bb2903..734e1b31c 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java @@ -10,10 +10,12 @@ package com.elink.esua.epdc.service.impl; import cn.hutool.core.collection.CollUtil; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.dao.SysRoleDataScopeDao; import com.elink.esua.epdc.dto.DataScopeDeptList; import com.elink.esua.epdc.entity.SysRoleDataScopeEntity; import com.elink.esua.epdc.service.SysRoleDataScopeService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,6 +30,8 @@ import java.util.List; @Service public class SysRoleDataScopeServiceImpl extends BaseServiceImpl implements SysRoleDataScopeService { + @Autowired + private RedisUtils redisUtils; @Override public List getDeptIdList(Long roleId) { @@ -64,6 +68,7 @@ public class SysRoleDataScopeServiceImpl extends BaseServiceImpl Date: Wed, 15 Apr 2020 16:23:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java index 734e1b31c..09c2d6312 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysRoleDataScopeServiceImpl.java @@ -68,7 +68,7 @@ public class SysRoleDataScopeServiceImpl extends BaseServiceImpl Date: Thu, 16 Apr 2020 11:21:53 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E8=8E=B7=E5=BE=97=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A5=E5=8F=A3-=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/DeptGridDTO.java | 61 +++++++++++++++++++ .../epdc/controller/SysUserController.java | 5 ++ .../com/elink/esua/epdc/dao/SysDeptDao.java | 6 +- .../esua/epdc/service/SysDeptService.java | 2 + .../epdc/service/impl/SysDeptServiceImpl.java | 12 ++++ .../src/main/resources/mapper/SysDeptDao.xml | 15 +++++ 6 files changed, 97 insertions(+), 4 deletions(-) create mode 100644 esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptGridDTO.java diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptGridDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptGridDTO.java new file mode 100644 index 000000000..f443a4b38 --- /dev/null +++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptGridDTO.java @@ -0,0 +1,61 @@ +/** + * Copyright (c) 2018 人人开源 All rights reserved. + *

+ * https://www.renren.io + *

+ * 版权所有，侵权必究！ + */ + +package com.elink.esua.epdc.dto; + +import com.elink.esua.epdc.commons.tools.utils.TreeNode; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Min; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Null; +import java.io.Serializable; +import java.util.Date; + +/** + * 部门管理 + * + * @author Mark sunlightcs@gmail.com + * @since 1.0.0 + */ +@Data +public class DeptGridDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 部门id + */ + private Long id; + /** + * 上级部门id + */ + private Long pid; + /** + * 部门名称 + */ + private String name; + + + /** + * 上级部门名称 + */ + private String parentName; + /** + * 部门总名称 + */ + private String deptName; + + +} diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java index 5bc562fc3..2de072642 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysUserController.java @@ -347,6 +347,11 @@ public class SysUserController { DeptOption deptOption = sysDeptService.getDeptAuthByUser(); return new Result().ok(deptOption); } + @GetMapping("deptOptions/getGridAuthByUser") + public Result> getGridAuthByUser() { + List deptOption = sysDeptService.getGridAuthByUser(); + return new Result().ok(deptOption); + } /** * 获取用户部门多层结构（完整层级结构，包括顶级部门），用户前端显示，请求需携带token diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java index 2c3e9516a..2bca8be97 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/dao/SysDeptDao.java @@ -10,10 +10,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptTreeDTO; -import com.elink.esua.epdc.dto.SysDeptDTO; -import com.elink.esua.epdc.dto.SysSimpleDeptDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridForLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.UserSysDeptInfoFormDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; @@ -131,6 +128,7 @@ public interface SysDeptDao extends BaseDao { List selectChildrenDeptNode(@Param("dataScopeDeptList") List dataScopeDeptList, @Param("parentDeptIdList") List parentDeptIdList); List selectChildrenDeptAuth(@Param("dataScopeDeptList") List dataScopeDeptList); + List getGridAuthByUser(@Param("deptList") List deptList); /** * @param formDTO diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java index 38bedcbe8..1542efda1 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/SysDeptService.java @@ -165,6 +165,8 @@ public interface SysDeptService extends BaseService { DeptOption getDeptAuthByUser(); + List getGridAuthByUser(); + /** * @param formDTO * @return java.util.List diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index f83e6657a..26b5dc272 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -353,6 +353,18 @@ public class SysDeptServiceImpl extends BaseServiceImpl getGridAuthByUser() { + // 用户拥有的所有部门权限 + List deptList = SecurityUser.getUser().getDeptIdList(); + List list; + if (deptList != null && deptList.size() > 0) { + list = baseDao.getGridAuthByUser(deptList); + } else { + return null; + } + return list; + } /** diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 6b75d0f15..f7465c572 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml @@ -167,6 +167,21 @@ GROUP BY tem1.ID ORDER BY tem1.create_date ASC +