From fa9696d8aa43bc4f362aebb6431cffc319f6f424 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 29 Jan 2021 17:09:48 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/controller/SysUserController.java    |  20 +++
 .../esua/epdc/service/SysDeptService.java     |   8 +
 .../epdc/service/impl/SysDeptServiceImpl.java |  15 ++
 .../src/main/resources/mapper/SysDeptDao.xml  |   2 +-
 .../esua/epdc/filter/WorkLogAuthFilter.java   | 139 ++++++++++++++++++
 .../epdc/utils/jwt/JwtTokenProperties.java    |  33 +++++
 .../esua/epdc/utils/jwt/JwtTokenUtils.java    |  71 +++++++++
 .../src/main/resources/application.yml        |  12 ++
 .../worklog/WorkLogAnalysisController.java    |  36 +++++
 .../dto/result/EpdcWorkLogUserDetailDTO.java  |  96 ++++++++++++
 .../epdc/controller/ApiWorkLogController.java |  59 ++++++++
 .../esua/epdc/feign/AdminFeignClient.java     |  11 ++
 .../esua/epdc/feign/AnalysisFeignClient.java  |  30 ++++
 .../fallback/AdminFeignClientFallback.java    |   5 +
 .../fallback/AnalysisFeignClientFallback.java |  20 +++
 .../elink/esua/epdc/service/AdminService.java |  26 ++++
 .../epdc/service/impl/AdminServiceImpl.java   |  51 +++++++
 esua-epdc/pom.xml                             |  25 +---
 18 files changed, 637 insertions(+), 22 deletions(-)
 create mode 100644 esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/WorkLogAuthFilter.java
 create mode 100644 esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenProperties.java
 create mode 100644 esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenUtils.java
 create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/worklog/WorkLogAnalysisController.java
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcWorkLogUserDetailDTO.java
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java

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 94793eb9..78d50af6 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
@@ -8,9 +8,11 @@
 
 package com.elink.esua.epdc.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO;
 import com.elink.esua.epdc.commons.tools.security.password.PasswordUtils;
@@ -415,4 +417,22 @@ public class SysUserController {
         return new Result<UserDetail>().ok(userDetail);
     }
 
+
+    /**
+     * 获取用户部门多层结构，用户前端显示，请求需携带token - 工作日志使用
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @author songyunpeng
+     * @date 2020/1/27 14:31
+     */
+    @PostMapping("deptOptions/getUserDeptOptionByUserId")
+    public Result<DeptOption> getUserDeptOptionByUserId(@RequestBody String userId) {
+        JSONObject paramsJSONObject = JSONObject.parseObject(userId);
+        String realUserId = paramsJSONObject.getString("userId");
+        if (realUserId == null) {
+            throw new RenException("参数错误");
+        }
+        return sysDeptService.getUserDeptOptionByUserId(realUserId);
+    }
+
 }
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 83180500..af7cf646 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
@@ -280,4 +280,12 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
      * @since 2021/1/20 9:59
      */
     List<SysDeptDTO> listOfDeptInfoByTypeKey(String typeKey);
+    /**
+     * @Description  获取用户部门多层结构，用户前端显示，请求需携带token - 工作日志使用
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     **/
+    Result<DeptOption> getUserDeptOptionByUserId(String userId);
 }
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 035b53ee..0fc9ec3e 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
@@ -472,6 +472,8 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
             node = new JSONObject();
             node.put("label", headDepts.get(i).getName());
             node.put("value", String.valueOf(deptId));
+            node.put("typeKey", headDepts.get(i).getTypeKey());
+
             parentNodeArray.add(node);
         }
         // 用于存放 每次组装好的 某一级节点。页面只需展示三级，所以没有存放顶级节点（市区）
@@ -541,6 +543,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                 if (nodeParent.get("value").equals(String.valueOf(childDepts.get(j).getPid()))) {
                     nodeChild = new JSONObject();
                     nodeChild.put("label", childDepts.get(j).getName());
+                    nodeChild.put("typeKey", childDepts.get(j).getTypeKey());
                     nodeChild.put("value", String.valueOf(deptId));
                     childrenNodeList.add(nodeChild);
 
@@ -962,4 +965,16 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     public List<SysDeptDTO> listOfDeptInfoByTypeKey(String typeKey) {
         return baseDao.selectListOfDeptInfoByTypeKey(typeKey);
     }
+
+    @Override
+    public Result<DeptOption> getUserDeptOptionByUserId(String userId) {
+        Long realUserId = Long.parseLong(userId);
+        String deptOptionKey = RedisKeys.getAdminUserDeptOptionKey(realUserId);
+        Object obj = redisUtils.get(deptOptionKey);
+        if (null == obj) {
+            this.packageUserDeptOption(realUserId);
+            obj = redisUtils.get(deptOptionKey);
+        }
+        return new Result<DeptOption>().ok((DeptOption) obj);
+    }
 }
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 d712572e..15a52698 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
@@ -133,7 +133,7 @@
 
     <select id="selectListHeadDeptNode" resultType="com.elink.esua.epdc.entity.SysDeptEntity">
         SELECT
-            d1.id, d1.`name`
+            d1.id, d1.`name`,d1.type_key
         FROM
             sys_dept d
             LEFT JOIN sys_dept d1 ON d.pids LIKE CONCAT( '%', d1.id, '%' )
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/WorkLogAuthFilter.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/WorkLogAuthFilter.java
new file mode 100644
index 00000000..8563b1e3
--- /dev/null
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/filter/WorkLogAuthFilter.java
@@ -0,0 +1,139 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.filter;
+
+import com.alibaba.fastjson.JSON;
+import com.elink.esua.epdc.commons.tools.constant.Constant;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.ResourceFeignClient;
+import com.elink.esua.epdc.utils.jwt.JwtTokenUtils;
+import io.jsonwebtoken.Claims;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.GlobalFilter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.server.reactive.ServerHttpRequest;
+import org.springframework.util.AntPathMatcher;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+/**
+ * 权限过滤器
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+@ConfigurationProperties(prefix = "worklog")
+public class WorkLogAuthFilter implements GlobalFilter {
+
+    private final AntPathMatcher antPathMatcher = new AntPathMatcher();
+
+    @Autowired
+    private ResourceFeignClient resourceFeignClient;
+
+    @Autowired
+    private JwtTokenUtils jwtUtils;
+
+    /**
+     * 拦截的工作日志接口
+     */
+    private List<String> urls;
+
+    @Override
+    public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
+        ServerHttpRequest request = exchange.getRequest();
+        String requestUri = request.getPath().pathWithinApplication().value();
+
+        //请求放行，无需验证权限
+        if(pathMatcher(requestUri)){
+            return chain.filter(exchange);
+        }
+
+        //获取AccessToken 并进行验证
+        String accessToken = request.getHeaders().getFirst(Constant.ACCESS_TOKEN);
+        if(StringUtils.isBlank(accessToken)){
+            // 表示请求信息中没有携带AccessToken，前端需要修改上送数据
+            throw new RenException("AccessToken为空");
+        }
+
+        Claims claims = jwtUtils.getClaimByToken(accessToken);
+
+        if (claims == null) {
+            throw new RenException("AccessToken验证不通过");
+        }
+        //验证结束
+
+        //获取用户token
+        String token = request.getHeaders().getFirst(Constant.TOKEN_HEADER);
+        if(StringUtils.isBlank(token)){
+            token = request.getHeaders().getFirst(Constant.AUTHORIZATION_HEADER);
+            if (StringUtils.isBlank(token)) {
+                token = request.getQueryParams().getFirst(Constant.TOKEN_HEADER);
+            }
+        }
+
+        //资源访问权限
+        String language = request.getHeaders().getFirst(HttpHeaders.ACCEPT_LANGUAGE);
+        Result<UserDetail> result = resourceFeignClient.resource(language, token, requestUri, request.getMethod().toString());
+        //没权限访问，直接返回
+        if(!result.success()){
+            return response(exchange, result);
+        }
+
+        //获取用户信息
+        UserDetail userDetail = result.getData();
+        if(userDetail != null){
+            //当前登录用户userId，添加到header中
+            ServerHttpRequest build = exchange.getRequest().mutate().header(Constant.USER_KEY, userDetail.getId()+"").build();
+            return chain.filter(exchange.mutate().request(build).build());
+        }
+
+        return chain.filter(exchange);
+    }
+
+    private Mono<Void> response(ServerWebExchange exchange, Object object) {
+        String json = JSON.toJSONString(object);
+        DataBuffer buffer = exchange.getResponse().bufferFactory().wrap(json.getBytes(StandardCharsets.UTF_8));
+        exchange.getResponse().getHeaders().setContentType(MediaType.APPLICATION_JSON_UTF8);
+        exchange.getResponse().setStatusCode(HttpStatus.OK);
+        return exchange.getResponse().writeWith(Flux.just(buffer));
+    }
+
+    private boolean pathMatcher(String requestUri){
+
+        for (String url : urls) {
+            if(antPathMatcher.match(url, requestUri)){
+                return false;
+            }
+        }
+        return true;
+    }
+
+    public List<String> getUrls() {
+        return urls;
+    }
+
+    public void setUrls(List<String> urls) {
+        this.urls = urls;
+    }
+
+}
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenProperties.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenProperties.java
new file mode 100644
index 00000000..b92a1243
--- /dev/null
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenProperties.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ *
+ * https://www.renren.io
+ *
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.utils.jwt;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Jwt
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Configuration
+@ConfigurationProperties(prefix = "jwt.token")
+public class JwtTokenProperties {
+    private String secret;
+
+    public String getSecret() {
+        return secret;
+    }
+
+    public void setSecret(String secret) {
+        this.secret = secret;
+    }
+
+}
diff --git a/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenUtils.java b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenUtils.java
new file mode 100644
index 00000000..e18f2bbb
--- /dev/null
+++ b/esua-epdc/epdc-gateway/src/main/java/com/elink/esua/epdc/utils/jwt/JwtTokenUtils.java
@@ -0,0 +1,71 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.utils.jwt;
+
+import io.jsonwebtoken.Claims;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * Jwt工具类
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Component
+public class JwtTokenUtils {
+    private static final Logger logger = LoggerFactory.getLogger(JwtTokenUtils.class);
+
+    @Autowired
+    private JwtTokenProperties jwtProperties;
+
+    /**
+     * 生成上报接口accessToken
+     *
+     * @param claims
+     * @return java.lang.String
+     * @author Liuchuang
+     * @since 2020/9/7 14:11
+     */
+    public String getEpmetAccessToken(Map<String,Object> claims){
+        return Jwts.builder()
+                .setHeaderParam("typ", "JWT")
+                .setClaims(claims)
+                .signWith(SignatureAlgorithm.HS512, jwtProperties.getSecret())
+                .compact();
+    }
+
+    public Claims getClaimByToken(String token) {
+        try {
+            return Jwts.parser()
+                    .setSigningKey(jwtProperties.getSecret())
+                    .parseClaimsJws(token)
+                    .getBody();
+        } catch (Exception e) {
+            logger.debug("validate is token error, token = " + token, e);
+            return null;
+        }
+    }
+
+    /**
+     * token是否过期
+     *
+     * @return true：过期
+     */
+    public boolean isTokenExpired(Date expiration) {
+        return expiration.before(new Date());
+    }
+}
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 411f2a7a..372ed22b 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -243,6 +243,13 @@ ribbon:
   ReadTimeout: 300000
   ConnectTimeout: 300000
 
+jwt:
+  token:
+    #秘钥
+    secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epdc]
+    #APPID
+    appid: 3b60f3e6e8281efe96a032682e5e5f7e
+
 renren:
   urls:
     - /auth/captcha
@@ -271,6 +278,7 @@ renren:
     - /api/residentConfig/getResidentConfig #获取居民端配置
     - /api/screenPopulationInfo/** #获取居民端配置
     - /analysis/admin/getDeptCode #获取组织结构编码
+    - /api/plugins/workLog/** #工作日志相关
   workUrls:
     - /api/work/** #工作端接口
     - /api/analysis/** #数据端接口
@@ -278,6 +286,9 @@ renren:
     - /contentSecurity/** #内容安全接口
     - /api/sys/**
 
+worklog:
+  urls:
+    - /api/plugins/workLog/** #工作日志相关
 
 epdc:
   # 党建e家接口
@@ -301,3 +312,4 @@ epdc:
     - /api/residentConfig/getResidentConfig #获取居民端配置
     - /api/screenPopulationInfo/** #获取居民端配置
     - /analysis/admin/getDeptCode #获取组织结构编码
+    - /api/plugins/workLog/** #工作日志相关
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/worklog/WorkLogAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/worklog/WorkLogAnalysisController.java
new file mode 100644
index 00000000..8eccaf09
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/worklog/WorkLogAnalysisController.java
@@ -0,0 +1,36 @@
+package com.elink.esua.epdc.modules.worklog;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 获取customID
+ * @Author songyunpeng
+ * @Date 2020/2/10 16:06
+ */
+@RestController
+@RequestMapping("workLog")
+public class WorkLogAnalysisController {
+
+    @Value("${epmet.config.customerId}")
+    private String customId;
+
+
+    /**
+     * @Description  获取customId
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping("getCustomId")
+    public Result<String> getCustomId(){
+        return new Result<String>().ok(customId);
+    }
+
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcWorkLogUserDetailDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcWorkLogUserDetailDTO.java
new file mode 100644
index 00000000..d21da22e
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcWorkLogUserDetailDTO.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 工作日志 用户信息
+ *
+ * @author Mark sunlightcs@gmail.com
+ * @since 1.0.0
+ */
+@Data
+public class EpdcWorkLogUserDetailDTO implements Serializable {
+
+    private static final long serialVersionUID = 3908231797102233188L;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 微信昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String profile;
+
+    /**
+     * 真实姓名
+     */
+    private String realName;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 所属组织Id
+     */
+    private String agencyId;
+
+    /**
+     * 所属组织Id路径
+     */
+    private String agencyIdPath;
+
+    /**
+     * 所属组织名称
+     */
+    private String agencyName;
+
+    /**
+     * 所属组织名称路径
+     */
+    private String agencyNamePath;
+
+    /**
+     * 所在网格Id（工作人员最一次访问的网格）
+     */
+    private String gridId;
+
+    /**
+     * 所在网格名称
+     */
+    private String gridName;
+
+    /**
+     * 是否总管理员，1是0否
+     */
+    private String adminFlag;
+
+    /**
+     * 手机号
+     */
+    private String mobile;
+
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
new file mode 100644
index 00000000..2441e028
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
@@ -0,0 +1,59 @@
+package com.elink.esua.epdc.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
+import com.elink.esua.epdc.service.AdminService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 工作日志相关
+ *
+ * @author songyunpeng
+ * @date 2021/1/27 10:30
+ */
+@RestController
+@RequestMapping("plugins/workLog")
+public class ApiWorkLogController {
+    @Autowired
+    private AdminService adminService;
+    /**
+     * @Description  获取用户信息
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
+     **/
+    @GetMapping("getUserInfo")
+    public Result<EpdcWorkLogUserDetailDTO> getUserInfo(){
+        return adminService.getUserInfo();
+    }
+
+     /**
+     * @Description  获取用户部门权限
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
+     **/
+    @PostMapping("getUserDeptOptionByUserId")
+    public Result<DeptOption> getUserDeptOptionByUserId(@RequestBody String userId){
+        return adminService.getUserDeptOptionByUserId(userId);
+    }
+
+    /**
+     * @Description  获取customId
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping("getCustomId")
+    public Result<String> getCustomId(){
+        return adminService.getCustomId();
+    }
+
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index 963cf641..c5def4b9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -178,4 +178,15 @@ public interface AdminFeignClient {
      */
     @GetMapping("sys/dept/getdeptinfo/{typeKey}")
     Result<List<SysDeptDTO>> getDeptInfoByTypeKey(@PathVariable String typeKey);
+
+
+    /**
+     * 获取用户部门多层结构，用户前端显示，请求需携带token  --  工作日志使用
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @author work@yujt.net.cn
+     * @date 2019/11/27 14:31
+     */
+    @PostMapping(value = "sys/user/deptOptions/getUserDeptOptionByUserId", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<DeptOption> getUserDeptOptionByUserId(String userId);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
new file mode 100644
index 00000000..c206e8ad
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.feign;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+
+/**
+ * 数据分析模块调用
+ *
+ * @Author：liuchuang
+ * @Date：2020/9/9 15:41
+ */
+@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class)
+public interface AnalysisFeignClient {
+
+    /**
+     * @Description  组织机构编码获取
+     * @Author songyunpeng
+     * @Date  2021/1/7
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    @GetMapping(value = "analysis/workLog/getCustomId", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<String> getCustomId();
+
+
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index c053e453..8f10b0e0 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -90,4 +90,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<SysDeptDTO>> getDeptInfoByTypeKey(String typeKey) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptInfoByTypeKey", typeKey);
     }
+
+    @Override
+    public Result<DeptOption> getUserDeptOptionByUserId(String userId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserDeptOptionByUserId",userId);
+    }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
new file mode 100644
index 00000000..bb6072e5
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.feign.fallback;
+
+import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
+import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Author：songyunpeg
+ * @Date：2020/9/9 15:42
+ */
+@Component
+public class AnalysisFeignClientFallback implements AnalysisFeignClient {
+
+    @Override
+    public Result getCustomId() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCustomId");
+    }
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
index 52674525..3346e0a9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
@@ -2,7 +2,9 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 
 import java.util.List;
 
@@ -59,4 +61,28 @@ public interface AdminService {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
      **/
     Result<String> getScripBySysUserId(Long userId);
+    /**
+     * @Description   获取用户信息
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
+     **/
+    Result<EpdcWorkLogUserDetailDTO> getUserInfo();
+    /**
+     * @Description   获取用户部门权限
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param [userId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     **/
+    Result<DeptOption> getUserDeptOptionByUserId(String userId);
+    /**
+     * @Description  获取customId 
+     * @Author songyunpeng
+     * @Date  2021/1/27
+     * @Param []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.lang.String>
+     **/
+    Result<String> getCustomId();
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
index fff43a31..958e7cb8 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@@ -1,13 +1,21 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.exception.RenException;
+import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
+import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.CompleteDeptDTO;
+import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
+import com.elink.esua.epdc.feign.AnalysisFeignClient;
 import com.elink.esua.epdc.service.AdminService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -25,6 +33,9 @@ public class AdminServiceImpl implements AdminService {
     @Autowired
     private AdminFeignClient adminFeignClient;
 
+    @Autowired
+    private AnalysisFeignClient analysisFeignClient;
+
     @Override
     public Result<String> getCompleteDeptName(Long gridId) {
         Result<CompleteDeptDTO> adminResult = adminFeignClient.getCompleteDept(gridId);
@@ -70,4 +81,44 @@ public class AdminServiceImpl implements AdminService {
     public Result<String> getScripBySysUserId(Long userId) {
         return  adminFeignClient.getScripBySysUserId(userId);
     }
+
+    @Override
+    public Result<EpdcWorkLogUserDetailDTO> getUserInfo() {
+        //缓存中用户信息
+        UserDetail user = SecurityUser.getUser();
+        if(user == null){
+            throw new RenException("用户未登录");
+        }
+        //查询用户部门等信息
+        //获取所有上级机构名称和ID拼接
+        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(user.getDeptId());
+        ParentAndAllDeptDTO deptDTO = dtoResult.getData();
+        Result<String> customIdResult = analysisFeignClient.getCustomId();
+        if(customIdResult == null || StringUtils.isBlank(customIdResult.getData())){
+            throw new RenException("无法获取到CustomID");
+        }
+        EpdcWorkLogUserDetailDTO epdcWorkLogUserDetailDTO = new EpdcWorkLogUserDetailDTO();
+        epdcWorkLogUserDetailDTO.setUserId(String.valueOf(user.getId()));
+        epdcWorkLogUserDetailDTO.setNickname(user.getRealName());
+        epdcWorkLogUserDetailDTO.setProfile(user.getHeadUrl());
+        epdcWorkLogUserDetailDTO.setRealName(user.getRealName());
+        epdcWorkLogUserDetailDTO.setCustomerId(customIdResult.getData());
+        epdcWorkLogUserDetailDTO.setAgencyId(String.valueOf(user.getDeptId()));
+        epdcWorkLogUserDetailDTO.setAgencyIdPath(deptDTO.getAllDeptIds());
+        epdcWorkLogUserDetailDTO.setAgencyName(deptDTO.getGrid());
+        epdcWorkLogUserDetailDTO.setAgencyNamePath(deptDTO.getAllDeptNames());
+        epdcWorkLogUserDetailDTO.setAgencyNamePath(String.valueOf(user.getSuperAdmin()));
+        epdcWorkLogUserDetailDTO.setMobile(user.getMobile());
+        return new Result<EpdcWorkLogUserDetailDTO>().ok(epdcWorkLogUserDetailDTO);
+    }
+
+    @Override
+    public Result<DeptOption> getUserDeptOptionByUserId(String userId) {
+        return adminFeignClient.getUserDeptOptionByUserId(userId);
+    }
+
+    @Override
+    public Result<String> getCustomId() {
+        return analysisFeignClient.getCustomId();
+    }
 }
diff --git a/esua-epdc/pom.xml b/esua-epdc/pom.xml
index 748435f6..f00ae6bb 100644
--- a/esua-epdc/pom.xml
+++ b/esua-epdc/pom.xml
@@ -116,26 +116,10 @@
     </build>
 
     <repositories>
-<!--        <repository>-->
-<!--            <id>public</id>-->
-<!--            <name>aliyun nexus</name>-->
-<!--            <url>http://47.104.85.99:9002/repository/maven-public/</url>-->
-<!--            <releases>-->
-<!--                <enabled>true</enabled>-->
-<!--            </releases>-->
-<!--        </repository>-->
-<!--        <repository>-->
-<!--            <id>elink-release</id>-->
-<!--            <name>aliyun nexus</name>-->
-<!--            <url>http://47.104.224.45:9002/repository/elink-release/</url>-->
-<!--            <releases>-->
-<!--                <enabled>true</enabled>-->
-<!--            </releases>-->
-<!--        </repository>-->
         <repository>
-            <id>elink-release</id>
-            <name>aliyun nexus</name>
-            <url>http://47.104.224.45:9002/repository/maven-public/</url>
+            <id>alimaven</id>
+            <name>aliyun maven</name>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -153,7 +137,7 @@
         <pluginRepository>
             <id>public</id>
             <name>aliyun nexus</name>
-            <url>http://47.104.224.45:9002/repository/maven-public/</url>
+            <url>http://maven.aliyun.com/nexus/content/groups/public/</url>
             <releases>
                 <enabled>true</enabled>
             </releases>
@@ -162,5 +146,4 @@
             </snapshots>
         </pluginRepository>
     </pluginRepositories>
-
 </project>

From 6610b14aef6e6935523ef3348ee937c2885bcdd3 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Mon, 1 Feb 2021 15:08:40 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/dto/DeptTreeDTO.java  |  1 +
 .../epdc/controller/SysUserController.java    | 11 ++-----
 .../epdc/service/impl/SysDeptServiceImpl.java |  1 +
 .../src/main/resources/mapper/SysDeptDao.xml  |  3 +-
 .../epdc/controller/ApiWorkLogController.java |  6 ++--
 .../esua/epdc/feign/AdminFeignClient.java     | 11 ++++++-
 .../fallback/AdminFeignClientFallback.java    |  9 ++++--
 .../elink/esua/epdc/service/AdminService.java |  2 +-
 .../epdc/service/impl/AdminServiceImpl.java   | 30 ++++++++++++-------
 9 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptTreeDTO.java b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptTreeDTO.java
index f5c9977b..b217423f 100644
--- a/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptTreeDTO.java
+++ b/esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/DeptTreeDTO.java
@@ -18,6 +18,7 @@ public class DeptTreeDTO implements Serializable {
     private Long pid;
 
     private String name;
+    private String typeKey;
 
 
 }
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 78d50af6..19152cfb 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
@@ -8,11 +8,9 @@
 
 package com.elink.esua.epdc.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.tools.annotation.LogOperation;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
-import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.security.bo.ResourceBO;
 import com.elink.esua.epdc.commons.tools.security.password.PasswordUtils;
@@ -426,13 +424,8 @@ public class SysUserController {
      * @date 2020/1/27 14:31
      */
     @PostMapping("deptOptions/getUserDeptOptionByUserId")
-    public Result<DeptOption> getUserDeptOptionByUserId(@RequestBody String userId) {
-        JSONObject paramsJSONObject = JSONObject.parseObject(userId);
-        String realUserId = paramsJSONObject.getString("userId");
-        if (realUserId == null) {
-            throw new RenException("参数错误");
-        }
-        return sysDeptService.getUserDeptOptionByUserId(realUserId);
+    public Result<DeptOption> getUserDeptOptionByUserId() {
+        return sysDeptService.getUserDeptOptionByUserId(String.valueOf(SecurityUser.getUserId()));
     }
 
 }
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 0fc9ec3e..3de1aa0f 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
@@ -604,6 +604,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
                         childNode = new JSONObject();
                         childNode.put("value", categoryTreeDto.getId());
                         childNode.put("label", categoryTreeDto.getName());
+                        childNode.put("typeKey", categoryTreeDto.getTypeKey());
                         children.add(childNode);
                         allChildren.add(childNode);
                     }
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 15a52698..1cb1a9c2 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
@@ -196,7 +196,8 @@
         SELECT
             sd.id,
             sd.pid,
-            sd.`name`
+            sd.`name`,
+            sd.type_key
         FROM
             sys_dept sd
             where sd.del_flag='0'
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
index 2441e028..27642c6d 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
@@ -25,7 +25,7 @@ public class ApiWorkLogController {
      * @Param []
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
      **/
-    @GetMapping("getUserInfo")
+    @PostMapping("getUserInfo")
     public Result<EpdcWorkLogUserDetailDTO> getUserInfo(){
         return adminService.getUserInfo();
     }
@@ -38,8 +38,8 @@ public class ApiWorkLogController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
      **/
     @PostMapping("getUserDeptOptionByUserId")
-    public Result<DeptOption> getUserDeptOptionByUserId(@RequestBody String userId){
-        return adminService.getUserDeptOptionByUserId(userId);
+    public Result<DeptOption> getUserDeptOptionByUserId(){
+        return adminService.getUserDeptOptionByUserId();
     }
 
     /**
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
index c5def4b9..c060e1c2 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java
@@ -188,5 +188,14 @@ public interface AdminFeignClient {
      * @date 2019/11/27 14:31
      */
     @PostMapping(value = "sys/user/deptOptions/getUserDeptOptionByUserId", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<DeptOption> getUserDeptOptionByUserId(String userId);
+    Result<DeptOption> getUserDeptOptionByUserId();
+    /**
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @Author yinzuomei
+     * @Description 获取所有组织机构信息
+     * @Date 2020/1/28 12:15
+     **/
+    @GetMapping("sys/dept/party/getDeptTree")
+    Result<DeptOption> getAllDeptTree();
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
index 8f10b0e0..8a996cd6 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java
@@ -92,7 +92,12 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     }
 
     @Override
-    public Result<DeptOption> getUserDeptOptionByUserId(String userId) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserDeptOptionByUserId",userId);
+    public Result<DeptOption> getUserDeptOptionByUserId() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getUserDeptOptionByUserId");
+    }
+
+    @Override
+    public Result<DeptOption> getAllDeptTree() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTree");
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
index 3346e0a9..9cfe1356 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
@@ -76,7 +76,7 @@ public interface AdminService {
      * @Param [userId]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
      **/
-    Result<DeptOption> getUserDeptOptionByUserId(String userId);
+    Result<DeptOption> getUserDeptOptionByUserId();
     /**
      * @Description  获取customId 
      * @Author songyunpeng
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
index 958e7cb8..e2ff209e 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@@ -1,6 +1,7 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
+import com.elink.esua.epdc.commons.tools.enums.SuperAdminEnum;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
@@ -89,10 +90,6 @@ public class AdminServiceImpl implements AdminService {
         if(user == null){
             throw new RenException("用户未登录");
         }
-        //查询用户部门等信息
-        //获取所有上级机构名称和ID拼接
-        Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(user.getDeptId());
-        ParentAndAllDeptDTO deptDTO = dtoResult.getData();
         Result<String> customIdResult = analysisFeignClient.getCustomId();
         if(customIdResult == null || StringUtils.isBlank(customIdResult.getData())){
             throw new RenException("无法获取到CustomID");
@@ -104,17 +101,30 @@ public class AdminServiceImpl implements AdminService {
         epdcWorkLogUserDetailDTO.setRealName(user.getRealName());
         epdcWorkLogUserDetailDTO.setCustomerId(customIdResult.getData());
         epdcWorkLogUserDetailDTO.setAgencyId(String.valueOf(user.getDeptId()));
-        epdcWorkLogUserDetailDTO.setAgencyIdPath(deptDTO.getAllDeptIds());
-        epdcWorkLogUserDetailDTO.setAgencyName(deptDTO.getGrid());
-        epdcWorkLogUserDetailDTO.setAgencyNamePath(deptDTO.getAllDeptNames());
-        epdcWorkLogUserDetailDTO.setAgencyNamePath(String.valueOf(user.getSuperAdmin()));
+        epdcWorkLogUserDetailDTO.setAdminFlag(String.valueOf(user.getSuperAdmin()));
         epdcWorkLogUserDetailDTO.setMobile(user.getMobile());
+        if(user.getSuperAdmin() == SuperAdminEnum.NO.value()){
+            //查询用户部门等信息
+            Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(user.getDeptId());
+            ParentAndAllDeptDTO deptDTO = dtoResult.getData();
+            epdcWorkLogUserDetailDTO.setAgencyIdPath(deptDTO.getAllDeptIds());
+            epdcWorkLogUserDetailDTO.setAgencyName(deptDTO.getGrid());
+            epdcWorkLogUserDetailDTO.setAgencyNamePath(deptDTO.getAllDeptNames());
+        }
         return new Result<EpdcWorkLogUserDetailDTO>().ok(epdcWorkLogUserDetailDTO);
     }
 
     @Override
-    public Result<DeptOption> getUserDeptOptionByUserId(String userId) {
-        return adminFeignClient.getUserDeptOptionByUserId(userId);
+    public Result<DeptOption> getUserDeptOptionByUserId() {
+        //缓存中用户信息
+        UserDetail user = SecurityUser.getUser();
+        if(user == null){
+            throw new RenException("用户未登录");
+        }
+        if(user.getSuperAdmin() == SuperAdminEnum.YES.value()){
+            return adminFeignClient.getAllDeptTree();
+        }
+        return adminFeignClient.getUserDeptOptionByUserId();
     }
 
     @Override

From ee8d5aa8a8e941d4cfdd03968c2c9f5623bfd04a Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 3 Feb 2021 09:35:43 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java   | 4 ++--
 .../src/main/resources/mapper/SysDeptDao.xml               | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

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 3de1aa0f..655c24e9 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
@@ -970,10 +970,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public Result<DeptOption> getUserDeptOptionByUserId(String userId) {
         Long realUserId = Long.parseLong(userId);
-        String deptOptionKey = RedisKeys.getAdminUserDeptOptionKey(realUserId);
+        String deptOptionKey = RedisKeys.getAllAdminUserDeptOptionKey(realUserId);
         Object obj = redisUtils.get(deptOptionKey);
         if (null == obj) {
-            this.packageUserDeptOption(realUserId);
+            this.packageAllUserDeptOption(realUserId);
             obj = redisUtils.get(deptOptionKey);
         }
         return new Result<DeptOption>().ok((DeptOption) obj);
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 1cb1a9c2..bc767365 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
@@ -136,10 +136,11 @@
             d1.id, d1.`name`,d1.type_key
         FROM
             sys_dept d
-            LEFT JOIN sys_dept d1 ON d.pids LIKE CONCAT( '%', d1.id, '%' )
+            LEFT JOIN sys_dept d1 ON d.pids LIKE CONCAT( '%', d1.id, '%' ) and d1.DEL_FLAG = '0'
         WHERE
             d.id IN <foreach collection="dataScopeDeptList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>
             AND d1.pid = 0
+            and d.DEL_FLAG = '0'
         GROUP BY d1.id
         ORDER BY d1.create_date ASC
     </select>
@@ -147,8 +148,8 @@
         SELECT
             tem2.*
         FROM
-            ( SELECT * FROM sys_dept d1 WHERE d1.id IN <foreach collection="dataScopeDeptList" item="item" open="(" separator="," close=")" > #{item} </foreach> ) tem1,
-            ( SELECT *  FROM sys_dept d2 WHERE d2.pid IN <foreach collection="parentDeptIdList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>) tem2
+            ( SELECT * FROM sys_dept d1 WHERE  DEL_FLAG = '0' and  d1.id IN <foreach collection="dataScopeDeptList" item="item" open="(" separator="," close=")" > #{item} </foreach> ) tem1,
+            ( SELECT *  FROM sys_dept d2 WHERE  DEL_FLAG = '0' and  d2.pid IN <foreach collection="parentDeptIdList" item="deptId" open="(" separator="," close=")" > #{deptId} </foreach>) tem2
         WHERE
             ( tem1.PIDS LIKE CONCAT( '%', tem2.id, '%' ) OR tem1.PID = tem2.ID )
             OR ( tem2.ID = tem1.ID AND NOT EXISTS ( SELECT 1 FROM sys_dept d WHERE d.PID = tem2.ID ) )

From 256c7b2b07c211fc76e25b682f2195577384c009 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Wed, 3 Feb 2021 10:56:55 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E7=A7=98=E9=92=A5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java  | 4 ++--
 esua-epdc/epdc-gateway/src/main/resources/application.yml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 655c24e9..3de1aa0f 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
@@ -970,10 +970,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     @Override
     public Result<DeptOption> getUserDeptOptionByUserId(String userId) {
         Long realUserId = Long.parseLong(userId);
-        String deptOptionKey = RedisKeys.getAllAdminUserDeptOptionKey(realUserId);
+        String deptOptionKey = RedisKeys.getAdminUserDeptOptionKey(realUserId);
         Object obj = redisUtils.get(deptOptionKey);
         if (null == obj) {
-            this.packageAllUserDeptOption(realUserId);
+            this.packageUserDeptOption(realUserId);
             obj = redisUtils.get(deptOptionKey);
         }
         return new Result<DeptOption>().ok((DeptOption) obj);
diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 372ed22b..18ffe317 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -246,9 +246,9 @@ ribbon:
 jwt:
   token:
     #秘钥
-    secret: 7016867071f0ebf1c46f123eaaf4b9d6[elink.epdc]
+    secret: 007e7e3620291354947e8b9791e2a4fa[elink.epdc]
     #APPID
-    appid: 3b60f3e6e8281efe96a032682e5e5f7e
+    appid: 003edc9c09463b30e39a94353313ce56
 
 renren:
   urls:

From 660e5829882ec2c231410de27a8d743dde3ec648 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 5 Feb 2021 10:17:17 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 esua-epdc/epdc-gateway/src/main/resources/application.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/esua-epdc/epdc-gateway/src/main/resources/application.yml b/esua-epdc/epdc-gateway/src/main/resources/application.yml
index 18ffe317..8e801d07 100644
--- a/esua-epdc/epdc-gateway/src/main/resources/application.yml
+++ b/esua-epdc/epdc-gateway/src/main/resources/application.yml
@@ -288,7 +288,8 @@ renren:
 
 worklog:
   urls:
-    - /api/plugins/workLog/** #工作日志相关
+    - /api/plugins/workLog/getUserInfo #获取用户信息
+    - /api/plugins/workLog/getUserDeptOptionByUserId #获取用户部门权限
 
 epdc:
   # 党建e家接口

From db1487519eb3f1c2d8de052c0b921cdd018416c3 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Fri, 5 Feb 2021 17:27:22 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E5=8A=9F=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/EpdcAppWorkLogUserResult.java  | 20 +++++++++++++++++++
 .../epdc/controller/ApiWorkLogController.java |  9 ++++++---
 .../elink/esua/epdc/service/AdminService.java |  4 ++--
 .../epdc/service/impl/AdminServiceImpl.java   | 19 +++++++++++++++---
 4 files changed, 44 insertions(+), 8 deletions(-)
 create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppWorkLogUserResult.java

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppWorkLogUserResult.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppWorkLogUserResult.java
new file mode 100644
index 00000000..9f64b3ef
--- /dev/null
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcAppWorkLogUserResult.java
@@ -0,0 +1,20 @@
+package com.elink.esua.epdc.dto.result;
+
+import com.elink.esua.epdc.dto.DeptOption;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author songyunpeng
+ * @Description
+ * @create 2021-02-05
+ */
+@Data
+public class EpdcAppWorkLogUserResult {
+
+
+    private DeptOption deptOption;
+
+    private List<Long> deptIds;
+}
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
index 27642c6d..7300a5c9 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkLogController.java
@@ -1,11 +1,14 @@
 package com.elink.esua.epdc.controller;
 
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.DeptOption;
+import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
 import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 import com.elink.esua.epdc.service.AdminService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * 工作日志相关
@@ -38,7 +41,7 @@ public class ApiWorkLogController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO>
      **/
     @PostMapping("getUserDeptOptionByUserId")
-    public Result<DeptOption> getUserDeptOptionByUserId(){
+    public Result<EpdcAppWorkLogUserResult> getUserDeptOptionByUserId(){
         return adminService.getUserDeptOptionByUserId();
     }
 
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
index 9cfe1356..27804d82 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AdminService.java
@@ -2,8 +2,8 @@ package com.elink.esua.epdc.service;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.dto.DeptOption;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
 import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 
 import java.util.List;
@@ -76,7 +76,7 @@ public interface AdminService {
      * @Param [userId]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
      **/
-    Result<DeptOption> getUserDeptOptionByUserId();
+    Result<EpdcAppWorkLogUserResult> getUserDeptOptionByUserId();
     /**
      * @Description  获取customId 
      * @Author songyunpeng
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
index e2ff209e..eeacc527 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java
@@ -12,6 +12,7 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO;
 import com.elink.esua.epdc.dto.SysSimpleDictDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcScripUserInfoFormDTO;
 import com.elink.esua.epdc.dto.epdc.result.EpdcAppSysDictResultDTO;
+import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult;
 import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO;
 import com.elink.esua.epdc.feign.AdminFeignClient;
 import com.elink.esua.epdc.feign.AnalysisFeignClient;
@@ -115,16 +116,28 @@ public class AdminServiceImpl implements AdminService {
     }
 
     @Override
-    public Result<DeptOption> getUserDeptOptionByUserId() {
+    public Result<EpdcAppWorkLogUserResult> getUserDeptOptionByUserId() {
         //缓存中用户信息
         UserDetail user = SecurityUser.getUser();
         if(user == null){
             throw new RenException("用户未登录");
         }
+        EpdcAppWorkLogUserResult epdcAppWorkLogUserResult = new EpdcAppWorkLogUserResult();
+        epdcAppWorkLogUserResult.setDeptIds(user.getDeptIdList());
         if(user.getSuperAdmin() == SuperAdminEnum.YES.value()){
-            return adminFeignClient.getAllDeptTree();
+            Result<DeptOption> allDeptTree = adminFeignClient.getAllDeptTree();
+            if(allDeptTree==null || allDeptTree.getData() ==null){
+                return  new Result<EpdcAppWorkLogUserResult>().error("获取部门列表失败");
+            }
+            epdcAppWorkLogUserResult.setDeptOption(allDeptTree.getData());
+            return new Result<EpdcAppWorkLogUserResult>().ok(epdcAppWorkLogUserResult);
         }
-        return adminFeignClient.getUserDeptOptionByUserId();
+        Result<DeptOption> userDeptOptionByUserId = adminFeignClient.getUserDeptOptionByUserId();
+        if(userDeptOptionByUserId==null || userDeptOptionByUserId.getData() ==null){
+            return  new Result<EpdcAppWorkLogUserResult>().error("获取部门列表失败");
+        }
+        epdcAppWorkLogUserResult.setDeptOption(userDeptOptionByUserId.getData());
+        return new Result<EpdcAppWorkLogUserResult>().ok(epdcAppWorkLogUserResult);
     }
 
     @Override