From 64cba326d48fa8b920dc41f72880ca46b1c12023 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Thu, 20 Aug 2020 11:07:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9F=BA=E6=9C=AC=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/CustomerServiceImpl.java   | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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 fdc8d2a240..f505545dde 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
@@ -622,7 +622,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
     public void updateCustomer(UpdateCustomerFormDTO formDTO) {
         CustomerEntity entity = new CustomerEntity();
         entity.setId(formDTO.getCustomerId());
-        entity.setCustomerName(formDTO.getCustomerName());
+        if (StringUtils.isNotBlank(formDTO.getCustomerName())){
+            entity.setCustomerName(formDTO.getCustomerName());
+        }
+        if (StringUtils.isNotBlank(formDTO.getLogo())){
+            entity.setLogo(formDTO.getLogo());
+        }
         entity.setLogo(formDTO.getLogo());
         baseDao.updateById(entity);
         if (StringUtils.isNotBlank(formDTO.getRootManageName()) || StringUtils.isNotBlank(formDTO.getRootManagePhone())) {
@@ -635,8 +640,12 @@ public class CustomerServiceImpl extends BaseServiceImpl<CustomerDao, CustomerEn
             UpdateRootManageFormDTO updateRootManageFormDTO = new UpdateRootManageFormDTO();
             updateRootManageFormDTO.setOrgId(agency.getId());
             updateRootManageFormDTO.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER);
-            updateRootManageFormDTO.setRootManageName(formDTO.getRootManageName());
-            updateRootManageFormDTO.setRootManagePhone(formDTO.getRootManagePhone());
+            if (StringUtils.isNotBlank(formDTO.getRootManageName())){
+                updateRootManageFormDTO.setRootManageName(formDTO.getRootManageName());
+            }
+            if (StringUtils.isNotBlank(formDTO.getRootManageName())){
+                updateRootManageFormDTO.setRootManagePhone(formDTO.getRootManagePhone());
+            }
             Result rootManageResult = epmetUserOpenFeignClient.updateRootManage(updateRootManageFormDTO);
             if (!rootManageResult.success()) {
                 throw new RenException("客户基本信息修改:修改根管理员信息失败:".concat(rootManageResult.toString()));