Merge remote-tracking branch 'origin/develop' into develop

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

@@ -400,13 +400,16 @@ public class AgencyServiceImpl implements AgencyService {
         agencysResultDTO.setRootAgencyId(rootAgency.getAgencyId());
 
         //3、当前登录用户所属客户，是否开启了area_code开关
-        Result<String> govOrgRes=govOrgOpenFeignClient.getAreaCodeSwitch(formDTO.getCustomerId());
+        // 这个接口返回areaCodeSwitch应该没有啥用...先注释吧
+        /*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");
-        }
+        }*/
+        agencysResultDTO.setAreaCodeSwitch("closed");
+
 
         //4、如果当前客户不存在子客户则areaCode置为空
         Result<List<String>> crmRes=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());