diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java index 9fe4219926..1d3974a4aa 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerRelationServiceImpl.java @@ -29,7 +29,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.CustomerRelationDao; -import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerDTO; import com.epmet.dto.CustomerRelationDTO; import com.epmet.dto.form.AreaCodeDetailFormDTO; @@ -185,18 +184,7 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl rootList = baseDao.selectRootCustomerByCustomerId(customerId); if (!rootList.isEmpty()) { - rootList.forEach(item -> { - AreaCodeDetailFormDTO formDTO = new AreaCodeDetailFormDTO(); - formDTO.setAreaCode(item.getAreaCode()); - formDTO.setLevel(item.getLevel()); - Result area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO); - if (area.success()) { - if (area.getData() != null) { - item.setAreaName(area.getData().getAreaName()); - } - } - getSubCustomer(item); - }); + rootList.forEach(this::getSubCustomer); } return rootList; } @@ -210,21 +198,19 @@ public class CustomerRelationServiceImpl extends BaseServiceImpl area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO); + if (area.success()) { + if (area.getData() != null) { + customer.setAreaName(area.getData().getAreaName()); + } + } List children = baseDao.selectSubCustomerByPid(customer.getCustomerId()); customer.setChildren(children); if (!children.isEmpty()) { - children.forEach(item -> { - AreaCodeDetailFormDTO formDTO = new AreaCodeDetailFormDTO(); - formDTO.setAreaCode(item.getAreaCode()); - formDTO.setLevel(item.getLevel()); - Result area = epmetCommonServiceOpenFeignClient.areaCodeDetail(formDTO); - if (area.success()) { - if (area.getData() != null) { - item.setAreaName(area.getData().getAreaName()); - } - } - getSubCustomer(item); - }); + children.forEach(this::getSubCustomer); } return customer; }