|
@ -477,7 +477,6 @@ public class AgencyServiceImpl implements AgencyService { |
|
|
|
|
|
|
|
|
@Override |
|
|
@Override |
|
|
public OrgTreeNode getStaffAgencyTree(OrgTreeFormDTO formDTO) { |
|
|
public OrgTreeNode getStaffAgencyTree(OrgTreeFormDTO formDTO) { |
|
|
//todo 获取客户的所有组织 然后遍历剔除 再构建出一颗树 咋样
|
|
|
|
|
|
//获取工作人员信息
|
|
|
//获取工作人员信息
|
|
|
CustomerStaffFormDTO staffParam = new CustomerStaffFormDTO(); |
|
|
CustomerStaffFormDTO staffParam = new CustomerStaffFormDTO(); |
|
|
staffParam.setMobile(formDTO.getMobile()); |
|
|
staffParam.setMobile(formDTO.getMobile()); |
|
@ -500,13 +499,30 @@ public class AgencyServiceImpl implements AgencyService { |
|
|
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); |
|
|
throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode()); |
|
|
} |
|
|
} |
|
|
List<OrgTreeNode> nodes = new ArrayList<>(); |
|
|
List<OrgTreeNode> nodes = new ArrayList<>(); |
|
|
|
|
|
ScreenCustomerAgencyDTO parentAgencyDTO = null; |
|
|
|
|
|
|
|
|
|
|
|
List<OrgTreeNode> nodeList = new ArrayList<>(); |
|
|
//单客户
|
|
|
//单客户
|
|
|
if (CollectionUtils.isEmpty(crmRes.getData())){ |
|
|
if (CollectionUtils.isEmpty(crmRes.getData())){ |
|
|
|
|
|
String parentId = staffAgencyDTO.getPid(); |
|
|
//todo 暂不处理 有时间再说
|
|
|
//todo 暂不处理 有时间再说
|
|
|
|
|
|
do { |
|
|
|
|
|
parentAgencyDTO = screenCustomerAgencyDao.selectByAgencyId(parentId); |
|
|
|
|
|
if (parentAgencyDTO == null){ |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
convertOrgTreeNode(nodeList, parentAgencyDTO); |
|
|
|
|
|
if (parentAgencyDTO.getPid() == null || NumConstant.ZERO_STR.equals(parentAgencyDTO.getPid())){ |
|
|
|
|
|
break; |
|
|
|
|
|
} |
|
|
|
|
|
parentId = parentAgencyDTO.getAreaCode(); |
|
|
|
|
|
} while (true); |
|
|
|
|
|
//多客户 获取所有下级
|
|
|
|
|
|
List<ScreenCustomerAgencyDTO> agencyNodeDTOS = screenCustomerAgencyDao.selectAllSubAgencyList(staffAgencyDTO.getPids(),null); |
|
|
|
|
|
agencyNodeDTOS.forEach(agency->convertOrgTreeNode(nodeList, agency)); |
|
|
|
|
|
nodes = TreeUtils.buildTreeByAreaCode(nodeList); |
|
|
}else { |
|
|
}else { |
|
|
ScreenCustomerAgencyDTO parentAgencyDTO = null; |
|
|
|
|
|
String parentAreaCode = staffAgencyDTO.getParentAreaCode(); |
|
|
String parentAreaCode = staffAgencyDTO.getParentAreaCode(); |
|
|
List<OrgTreeNode> nodeList = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
|
/*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); |
|
|
/*ScreenCustomerAgencyDTO currentAgency = new ScreenCustomerAgencyDTO(); |
|
|
currentAgency.setCustomerId(staffAgencyDTO.getCustomerId()); |
|
|
currentAgency.setCustomerId(staffAgencyDTO.getCustomerId()); |
|
|