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 298b467b89..fb9ea27ab0 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 @@ -686,7 +686,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl gridList = customerGridDao.selectAgencyGridList(agencyEntity.getId()); returnDTO.setGridList(gridList); //递归查询当前组织的下级组织以及每个下级组织对应的网格列表 - List subAgencyGridList = getGridList(agencyEntity.getPids() + ":" + agencyEntity.getId()); + //根组织pids为空 + List subAgencyGridList = getGridList(("".equals(agencyEntity.getPids())?"":agencyEntity.getPids() + ":")+agencyEntity.getId()); returnDTO.setSubAgencyGridList(subAgencyGridList); } else if (gridParty) { //4.2:查询人员在当前机关下参与的网格列表 diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java index 186b427914..19dcbf3d5d 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/TagServiceImpl.java @@ -99,6 +99,9 @@ public class TagServiceImpl implements TagService { */ @Override public List correlationTagList(TokenDto tokenDto, CorrelationTagListFormDTO formDto) { + if (formDto.getTagIdList().size() == NumConstant.ZERO){ + return new ArrayList<>(); + } String customerId = tokenDto.getCustomerId(); return tagRedis.get(customerId,formDto); } @@ -110,6 +113,9 @@ public class TagServiceImpl implements TagService { */ @Override public List tagCascadeList(TagCascadeListFormDTO formDto) { + if (formDto.getTagIdList().size() == NumConstant.ZERO){ + return new ArrayList<>(); + } return tagRedis.getResiTag(formDto); } } \ No newline at end of file