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 1/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=9F=BA=E6=9C=AC?=
 =?UTF-8?q?=E4=BF=A1=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()));

From f2b609245882ea5241f154058502e010fbc9aee1 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 20 Aug 2020 13:38:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=88=97=E8=A1=A8bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomerFunctionDetailDao.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
index ded8b1514d..cd909626de 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
@@ -56,14 +56,14 @@
             cfd.function_name AS "functionName",
             cfd.icon_large_img AS "iconLargeImg",
             cfd.icon_small_img AS "iconSmallImg",
+            cfd.shopping_status AS "shoppingStatus",
+            cfd.domain_name AS "domainName",
+            cfd.target_link AS "targetLink",
             cfd.display_order AS "displayOrder",
             fc.customized_name AS "customizedName",
             fc.from_app AS "fromApp",
             fc.icon_large_img AS "defaultLargeImg",
             fc.icon_small_img AS "defaultSmallImg ",
-            fc.domain_name AS "domainName",
-            fc.target_link AS "targetLink",
-            f.shopping_status AS "shoppingStatus",
             f.function_explain AS "functionExplain"
         FROM
             customer_function_detail cfd