From ff33e88e88570ea2d42a6fee87c91ab915933498 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 11 Jan 2022 10:43:04 +0800
Subject: [PATCH] =?UTF-8?q?updatecustomer=E5=85=88=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E5=90=A7=EF=BC=8C=E4=B8=8D=E4=B8=80=E5=AE=9A=E4=BB=80=E4=B9=88?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=81=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java | 4 ++--
 .../main/java/com/epmet/controller/CustomerController.java   | 5 +++--
 .../src/main/java/com/epmet/feign/GovOrgFeignClient.java     | 2 +-
 .../java/com/epmet/service/impl/CustomerServiceImpl.java     | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index df9e958d8c..f36f1cbaf3 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -20,8 +20,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:37
  */
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092")
-// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class)
+// @FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class, url = "localhost:8092")
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallbackFactory = GovOrgOpenFeignClientFallbackFactory.class)
 public interface GovOrgOpenFeignClient {
 
     /**
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
index 0ac59f3342..907ffbc967 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerController.java
@@ -316,11 +316,12 @@ public class CustomerController {
 	@PostMapping("updatecustomer")
 	public Result updateCustomer(@LoginUser TokenDto tokenDto,@RequestBody UpdateCustomerFormDTO formDTO) {
 		formDTO.setUserId(tokenDto.getUserId());
-		ValidatorUtils.validateEntity(formDTO,UpdateCustomerFormDTO.ShowGroup.class,UpdateCustomerFormDTO.AddUserInternalGroup.class);
+		//确定好需求，再放开
+		/*ValidatorUtils.validateEntity(formDTO,UpdateCustomerFormDTO.ShowGroup.class,UpdateCustomerFormDTO.AddUserInternalGroup.class);
 		//如果开启了组织区划开关，根组织的组织区划变态男
 		if("open".equals(formDTO.getAreaCodeSwitch())){
 			ValidatorUtils.validateEntity(formDTO,UpdateCustomerFormDTO.OpenAreaCodeSwitchGroup.class);
-		}
+		}*/
 		customerService.updateCustomer(formDTO);
 		return new Result();
 	}
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
index 7b6133303e..ddd811450f 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/feign/GovOrgFeignClient.java
@@ -17,7 +17,7 @@ import java.util.List;
 import java.util.Map;
 
 //, url = "localhost:8092"
-@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class, url = "localhost:8092")
+@FeignClient(name = ServiceConstant.GOV_ORG_SERVER, fallback = GovOrgFeignClientFallBack.class)
 public interface GovOrgFeignClient {
 
     /**
diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
index 2f493872d7..856a72c96d 100644
--- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
+++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerServiceImpl.java
@@ -700,11 +700,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
         }
 
         //2、设置组织区划开关、根组织的组织区划  调用gov-org服务
-        CustomerAreaCodeFormDTO areaCodeFormDTO = ConvertUtils.sourceToTarget(formDTO, CustomerAreaCodeFormDTO.class);
+        //确定好需求再放开
+        /*CustomerAreaCodeFormDTO areaCodeFormDTO = ConvertUtils.sourceToTarget(formDTO, CustomerAreaCodeFormDTO.class);
         Result govOrgresult = govOrgOpenFeignClient.configCustomerAreaCode(areaCodeFormDTO);
         if (!govOrgresult.success()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "gov-org服务异常：" + govOrgresult.getInternalMsg(), "设置组织区划接口返回异常：" + govOrgresult.getMsg());
-        }
+        }*/
 
         //3、修改客户名称
         CustomerEntity entity = new CustomerEntity();