【多部门管理】-【获得部门类型修改】-（王童）-2020/05/15

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

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

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) {
+    public Result getDeptTypeKey(Long deptId) {
-        if (StringUtils.isBlank(deptId)) {
+//        if (StringUtils.isBlank(deptId)) {
-            throw new RenException("部门ID不可为空");
+//            throw new RenException("部门ID不可为空");
-        }
+//        }
         SysDeptEntity dept = baseDao.selectById(deptId);
         if (null == dept) {
             throw new RenException("未查到部门相关信息");

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

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

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

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

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