From be58a4ba65861fa97777e43c7c8a71401dfcaad4 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 25 Oct 2021 13:34:56 +0800 Subject: [PATCH] =?UTF-8?q?PC=E7=AB=AF=EF=BC=8C=E5=BF=97=E6=84=BF=E8=80=85?= =?UTF-8?q?-=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1=E7=90=86=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E7=9A=84=E6=89=80=E5=B1=9E=E6=9C=BA=E6=9E=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/service/impl/VolunteerInfoServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java index 4fa75309..b202df51 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java @@ -88,9 +88,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl volunteerInfo(Map params) { String streetId = MapUtil.getStr(params, "streetId"); String communityId = MapUtil.getStr(params, "communityId"); - - String deptId = StringUtils.isNotBlank(streetId) ? streetId : - StringUtils.isNotBlank(communityId) ? communityId : MapUtil.getStr(params, "gridId"); + String gridId = MapUtil.getStr(params, "gridId"); + + String deptId = null; + if(StringUtils.isNotBlank(gridId)){ + deptId = gridId; + }else if(StringUtils.isNotBlank(communityId)){ + deptId = communityId; + }else if(StringUtils.isNotBlank(streetId)){ + deptId = streetId; + } params.put("deptId", deptId); IPage page = getPage(params);