agencydetail-multic

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -393,8 +393,15 @@ public class AgencyServiceImpl implements AgencyService {
         ScreenCustomerAgencyDTO rootAgency=screenCustomerAgencyDao.selectCustomerRootAgency(formDTO.getCustomerId());
         agencysResultDTO.setRootlevel(rootAgency.getLevel());
         agencysResultDTO.setRootAgencyId(rootAgency.getAgencyId());
+
         //3、当前登录用户所属客户，是否开启了area_code开关
-        agencysResultDTO.setAreaCodeSwitch(govOrgOpenFeignClient.getAreaCodeSwitch(formDTO.getCustomerId()).getData());
+        Result<String> govOrgRes=govOrgOpenFeignClient.getAreaCodeSwitch(formDTO.getCustomerId());
+        log.info("当前登录用户所属客户，是否开启了area_code开关,返参："+ JSON.toJSONString(govOrgRes));
+        if(govOrgRes.success()&&StringUtils.isNotBlank(govOrgRes.getData())){
+            agencysResultDTO.setAreaCodeSwitch(govOrgRes.getData());
+        }else{
+            agencysResultDTO.setAreaCodeSwitch("closed");
+        }
 
         //4、如果当前客户不存在子客户则areaCode置为空
         Result<List<String>> crmRes=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java

@@ -350,6 +350,6 @@ public interface GovOrgOpenFeignClient {
      * @description  根据customerId查询参数(area_code_switch)值open: 选择地区编码必填；closed:  无需选择地区编码;;0409新增返参;没配置,返回closed
      * @Date 2021/6/24 16:11
      **/
-    @PostMapping(value = "/gov/org/customeragency/getAreaCodeSwitch/{customerId}")
+    @GetMapping(value = "/gov/org/customeragency/getareacodeswitch/{customerId}")
     Result<String> getAreaCodeSwitch(@PathVariable("customerId")String customerId);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -298,7 +298,7 @@ public class CustomerAgencyController {
         return new Result<OrganizeTreeResultDTO>().ok(customerAgencyService.organizeTree(agencyId));
     }
 
-    @PostMapping("getAreaCodeSwitch/{customerId}")
+    @GetMapping("getareacodeswitch/{customerId}")
     public Result<String> getAreaCodeSwitch(@PathVariable("customerId")String customerId){
      return new Result<String>().ok(customerOrgParameterService.getAreaCodeSwitch(customerId));
     }