From 2f17ff3d0fbd685987048d9ddb7438a0cc747704 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Fri, 15 May 2020 16:12:50 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A4=9A=E9=83=A8=E9=97=A8=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E3=80=91-=E3=80=90=E8=8E=B7=E5=BE=97=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9=E3=80=91-?=
 =?UTF-8?q?=EF=BC=88=E7=8E=8B=E7=AB=A5=EF=BC=89-2020/05/15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/SysDeptController.java | 2 +-
 .../java/com/elink/esua/epdc/service/SysDeptService.java  | 2 +-
 .../elink/esua/epdc/service/impl/SysDeptServiceImpl.java  | 8 ++++----
 .../elink/esua/epdc/controller/ApiWorkUserController.java | 2 +-
 .../java/com/elink/esua/epdc/feign/AdminFeignClient.java  | 2 +-
 .../epdc/feign/fallback/AdminFeignClientFallback.java     | 2 +-
 .../java/com/elink/esua/epdc/service/WorkUserService.java | 2 +-
 .../elink/esua/epdc/service/impl/WorkUserServiceImpl.java | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
index 1067833b2..8fbbefc72 100644
--- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
+++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/controller/SysDeptController.java
@@ -303,7 +303,7 @@ public class SysDeptController {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @GetMapping("getDeptTypeKey")
-    public Result getDeptTypeKey(String deptId) {
+    public Result getDeptTypeKey(Long deptId) {
         return sysDeptService.getDeptTypeKey(deptId);
     }
 }
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 5c47dd9b2..4a30f0e3e 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
@@ -279,5 +279,5 @@ public interface SysDeptService extends BaseService<SysDeptEntity> {
     * @param [deptId]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    Result getDeptTypeKey(String deptId);
+    Result getDeptTypeKey(Long deptId);
 }
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 0c55fe1e6..1574ea7c3 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
@@ -1054,10 +1054,10 @@ public class SysDeptServiceImpl extends BaseServiceImpl<SysDeptDao, SysDeptEntit
     }
 
     @Override
-    public Result getDeptTypeKey(String deptId) {
-        if (StringUtils.isBlank(deptId)) {
-            throw new RenException("部门ID不可为空");
-        }
+    public Result getDeptTypeKey(Long deptId) {
+//        if (StringUtils.isBlank(deptId)) {
+//            throw new RenException("部门ID不可为空");
+//        }
         SysDeptEntity dept = baseDao.selectById(deptId);
         if (null == dept) {
             throw new RenException("未查到部门相关信息");
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
index 4e3f93244..65efa6191 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiWorkUserController.java
@@ -230,7 +230,7 @@ public class ApiWorkUserController {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @GetMapping("getDeptTypeKey")
-    public Result getDeptTypeKey(String deptId) {
+    public Result getDeptTypeKey(Long deptId) {
         return workUserService.getDeptTypeKey(deptId);
     }
 
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 30b7f0bb2..2052f30b0 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
@@ -128,5 +128,5 @@ public interface AdminFeignClient {
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
     @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result getDeptTypeKey(@RequestParam("deptId") String deptId);
+    Result getDeptTypeKey(@RequestParam("deptId") Long deptId);
 }
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 4f6bdabe5..c6e5d3da8 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
@@ -65,7 +65,7 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     }
 
     @Override
-    public Result getDeptTypeKey(String deptId) {
+    public Result getDeptTypeKey(Long deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId);
     }
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
index 978a95514..f7a58901a 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/WorkUserService.java
@@ -165,5 +165,5 @@ public interface WorkUserService {
     * @param [deptId]
     * @return com.elink.esua.epdc.commons.tools.utils.Result
     */
-    Result getDeptTypeKey(String deptId);
+    Result getDeptTypeKey(Long deptId);
 }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
index 209e1fa39..60e8cc66c 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkUserServiceImpl.java
@@ -354,7 +354,7 @@ public class WorkUserServiceImpl implements WorkUserService {
     }
 
     @Override
-    public Result getDeptTypeKey(String deptId) {
+    public Result getDeptTypeKey(Long deptId) {
         return adminFeignClient.getDeptTypeKey(deptId);
     }
 }