|
|
@ -391,6 +391,8 @@ public class AgencyServiceImpl implements AgencyService { |
|
|
|
return agencysResultDTO; |
|
|
|
} |
|
|
|
agencysResultDTO = ConvertUtils.sourceToTarget(customerAgencyDTO, AgencyDetailMulticResultDTO.class); |
|
|
|
agencysResultDTO.setAgencyCustomerId(customerAgencyDTO.getCustomerId()); |
|
|
|
|
|
|
|
//2、当前登录用户所属客户,的跟级组织
|
|
|
|
ScreenCustomerAgencyDTO rootAgency=screenCustomerAgencyDao.selectCustomerRootAgency(formDTO.getCustomerId()); |
|
|
|
agencysResultDTO.setRootlevel(rootAgency.getLevel()); |
|
|
@ -421,21 +423,27 @@ public class AgencyServiceImpl implements AgencyService { |
|
|
|
} |
|
|
|
|
|
|
|
if(agencysResultDTO.getHaveSubCustomer()){ |
|
|
|
if (StringUtils.isBlank(customerAgencyDTO.getPids())||NumConstant.ZERO_STR.equals(customerAgencyDTO.getPid())) { |
|
|
|
if (formDTO.getCustomerId().equals(agencysResultDTO.getAgencyCustomerId()) |
|
|
|
&& (StringUtils.isBlank(customerAgencyDTO.getPids()) |
|
|
|
||NumConstant.ZERO_STR.equals(customerAgencyDTO.getPid()))) { |
|
|
|
log.info(String.format("1)当前组织agencyId=%s,为根基组织,不需要查询parentList",formDTO.getAgencyId())); |
|
|
|
agencysResultDTO.setParentList(parentList); |
|
|
|
}else{ |
|
|
|
// 5、多客户时根据area_code查询上级,自下向上,查询到当前客户的跟组织即可stop
|
|
|
|
log.info("多客户版本parentList、level要重新赋值"); |
|
|
|
log.info("多客户版本parentList、level要重新赋值;agencysResultDTO.getParentAreaCode()="+agencysResultDTO.getParentAreaCode()); |
|
|
|
ScreenCustomerAgencyDTO parentAgency=screenCustomerAgencyDao.selectByAreaCode(agencysResultDTO.getParentAreaCode()); |
|
|
|
if (null != parentAgency) { |
|
|
|
agencysResultDTO.setLevel(getAgencyLevelMultiC(parentAgency)); |
|
|
|
List<ParentListResultDTO> temp = getParentListMultic(parentList,parentAgency,formDTO.getCustomerId(),agencysResultDTO.getRootAgencyId()); |
|
|
|
List<ParentListResultDTO> temp = getParentListMultic(parentList, parentAgency, formDTO.getCustomerId(), agencysResultDTO.getRootAgencyId()); |
|
|
|
agencysResultDTO.setParentList(temp); |
|
|
|
} |
|
|
|
} |
|
|
|
}else{ |
|
|
|
//单客户
|
|
|
|
//6:查询当前组织的所有上级组织,按自上而下层级顺序
|
|
|
|
if (StringUtils.isBlank(customerAgencyDTO.getPids())||NumConstant.ZERO_STR.equals(customerAgencyDTO.getPid())) { |
|
|
|
if (formDTO.getCustomerId().equals(agencysResultDTO.getAgencyCustomerId()) |
|
|
|
&& (StringUtils.isBlank(customerAgencyDTO.getPids()) |
|
|
|
||NumConstant.ZERO_STR.equals(customerAgencyDTO.getPid()))) { |
|
|
|
log.info(String.format("2)当前组织agencyId=%s,为根基组织,不需要查询parentList",formDTO.getAgencyId())); |
|
|
|
agencysResultDTO.setParentList(parentList); |
|
|
|
}else{ |
|
|
|