【多部门管理】-【部门处理修改】-（王童）-2020/05/15

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/AdminFeignClient.java

@@ -10,6 +10,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -90,4 +91,15 @@ public interface AdminFeignClient {
      */
     @GetMapping("sys/user/getSysGridLeaderPhone/{deptId}")
     Result<List<String>> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId);
+
+
+    /**
+     * @describe: 获得部门类型
+     * @author wangtong
+     * @date 2020/5/15 14:41
+     * @param [deptId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     */
+    @GetMapping(value="sys/dept/getDeptTypeKey", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result getDeptTypeKey(@RequestParam("deptId") Long deptId);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/feign/fallback/AdminFeignClientFallback.java

@@ -54,4 +54,9 @@ public class AdminFeignClientFallback implements AdminFeignClient {
     public Result<List<String>> getSysGridLeaderPhone(@PathVariable("deptId") Long deptId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getSysGridLeaderPhone", deptId);
     }
+
+    @Override
+    public Result getDeptTypeKey(Long deptId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTypeKey",deptId);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -603,13 +603,12 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
     @Transactional(rollbackFor = Exception.class)
     public Result modifyHandleResult(ItemHandleSubmitFormDTO dto) {
         try {
-            Result<SysDeptDTO> deptMessage =  adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId());
-            if( null == deptMessage.getData()){
-                throw new RenException("未查到该部门相关信息");
-            }
-            String typeKey = deptMessage.getData().getTypeKey();
-            if(StringUtils.isBlank(typeKey)){
-                throw new RenException("未查到该部门的键类型信息");
+            Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getHandlerDeptId());
+            String typeKey = "";
+            if( 0 == deptMessage.getCode()){
+                typeKey = deptMessage.getData().toString();
+            }else{
+                throw new RenException(deptMessage.getMsg());
             }
             dto.setTypeKey(typeKey);
             ItemEntity entity = baseDao.selectById(dto.getId());