From 4a137da22382c991523bf3bce7455a00dc6f6b80 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 20 Aug 2020 15:50:53 +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=E5=8F=AA=E6=94=B9=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E5=90=8D=E5=92=8Clogo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/UpdateCustomerFormDTO.java | 16 +++---- .../service/impl/CustomerServiceImpl.java | 42 +++++++++---------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/UpdateCustomerFormDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/UpdateCustomerFormDTO.java index e4627c7134..6186d67bfb 100644 --- a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/UpdateCustomerFormDTO.java +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/form/UpdateCustomerFormDTO.java @@ -27,12 +27,12 @@ public class UpdateCustomerFormDTO implements Serializable { * logo */ private String logo; - /** - * 根管理员姓名 - */ - private String rootManageName; - /** - * 根管理员电话 - */ - private String rootManagePhone; +// /** +// * 根管理员姓名 +// */ +// private String rootManageName; +// /** +// * 根管理员电话 +// */ +// private String rootManagePhone; } 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 f505545dde..323388de35 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 @@ -630,27 +630,27 @@ public class CustomerServiceImpl extends BaseServiceImpl customerRootAgencyRst = govOrgFeignClient.getCustomerRootAgency(formDTO.getCustomerId()); - if (!customerRootAgencyRst.success() || null == customerRootAgencyRst.getData()) { - throw new RenException("客户基本信息修改:查询客户根级组织失败:".concat(customerRootAgencyRst.toString())); - } - CustomerAgencyDTO agency = customerRootAgencyRst.getData(); - UpdateRootManageFormDTO updateRootManageFormDTO = new UpdateRootManageFormDTO(); - updateRootManageFormDTO.setOrgId(agency.getId()); - updateRootManageFormDTO.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER); - 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())); - } - } +// if (StringUtils.isNotBlank(formDTO.getRootManageName()) || StringUtils.isNotBlank(formDTO.getRootManagePhone())) { +// // 根级组织 +// Result customerRootAgencyRst = govOrgFeignClient.getCustomerRootAgency(formDTO.getCustomerId()); +// if (!customerRootAgencyRst.success() || null == customerRootAgencyRst.getData()) { +// throw new RenException("客户基本信息修改:查询客户根级组织失败:".concat(customerRootAgencyRst.toString())); +// } +// CustomerAgencyDTO agency = customerRootAgencyRst.getData(); +// UpdateRootManageFormDTO updateRootManageFormDTO = new UpdateRootManageFormDTO(); +// updateRootManageFormDTO.setOrgId(agency.getId()); +// updateRootManageFormDTO.setRoleKey(RoleKeyConstants.ROLE_KEY_ROOT_MANAGER); +// 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())); +// } +// } } /**