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 2e3791113e..9510e0631d 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 @@ -147,7 +147,7 @@ public class CustomerServiceImpl extends BaseServiceImpl { CustomerAgencyDTO rootAgency = rootAgencies.get(customer.getCustomerId()); customer.setHasRootAgency(rootAgency == null ? false : true); - customer.setRootAgencyId(rootAgency == null ? null : rootAgency.getId()); + customer.setRootAgencyId(rootAgency == null ? "" : rootAgency.getId()); if (rootAgency != null) { rootAgencyIds.add(rootAgency.getId()); } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml index 40be773fe0..8ed4314464 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/mapper/CustomerDao.xml @@ -24,10 +24,9 @@