工作日志修改

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;
 
 
 }

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()));
     }
 
 }

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);
                     }

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'

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();
     }
 
     /**

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();
 }

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");
     }
 }

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

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.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());
-        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);
+    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