From c95faa7ce099fd651492d40132d49e009f24f2cf Mon Sep 17 00:00:00 2001 From: zxc <954985706@qq.com> Date: Tue, 9 Jun 2020 16:24:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BA=A7=E8=81=94=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/TagServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) 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 From 28f0d0338b4055e223dbae0b4113cd233c740598 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 9 Jun 2020 16:59:28 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=AF=E9=80=89=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=8E=A5=E5=8F=A3-=E6=A0=B9=E7=BB=84?= =?UTF-8?q?=E7=BB=87pids=E4=B8=BA=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerAgencyServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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:查询人员在当前机关下参与的网格列表