diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index 7b4516ab77..8b45ddb6ef 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -505,7 +505,6 @@ public class AgencyServiceImpl implements AgencyService { //单客户 if (CollectionUtils.isEmpty(crmRes.getData())){ String parentId = staffAgencyDTO.getPid(); - //todo 暂不处理 有时间再说 do { parentAgencyDTO = screenCustomerAgencyDao.selectByAgencyId(parentId); if (parentAgencyDTO == null){ @@ -523,18 +522,6 @@ public class AgencyServiceImpl implements AgencyService { nodes = TreeUtils.buildTreeByAreaCode(nodeList); }else { String parentAreaCode = staffAgencyDTO.getParentAreaCode(); - - /*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); - currentAgency.setCustomerId(staffAgencyDTO.getCustomerId()); - currentAgency.setAgencyId(staffAgencyDTO.getId()); - currentAgency.setAgencyName(staffAgencyDTO.getOrganizationName()); - currentAgency.setLevel(staffAgencyDTO.getLevel()); - currentAgency.setAreaCode(staffAgencyDTO.getAreaCode()); - currentAgency.setParentAreaCode(staffAgencyDTO.getParentAreaCode()); - currentAgency.setPid(staffAgencyDTO.getPid()); - currentAgency.setPids(staffAgencyDTO.getPids()); - - convertOrgTreeNode(nodeList, currentAgency);*/ //多客户 获取所有直线上级 do { parentAgencyDTO = screenCustomerAgencyDao.selectByAreaCode(parentAreaCode);