工作日志权限功能修改

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

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

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

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