Merge branch 'dev_plugins' into dev_temp

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()));

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