diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index 69a1d4ec87..e399d29b85 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -581,8 +581,11 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyIdList = new ArrayList<>(); if (args.length < NumConstant.ONE) { processorList.setParentAgencyList(parentAgencyList); @@ -594,7 +597,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl parentList = baseDao.selectAgencyListByIds(agencyIdList); - parentList.forEach(parent->{ + parentList.forEach(parent -> { AgencyResultDTO agency = new AgencyResultDTO(); agency.setAgencyId(parent.getId()); agency.setAgencyName(parent.getOrganizationName()); @@ -603,7 +606,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl subAgencyList = getDepartmentList(entity.getPids() + ":" + entity.getId()); + List subAgencyList = getDepartmentList(("".equals(entity.getPids()) ? "" : entity.getPids() + ":") + entity.getId()); processorList.setSubAgencyList(subAgencyList); return processorList;