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
     
+