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<VolunteerInfoDao,
     public PageData<VolunteerInfoDTO> volunteerInfo(Map<String, Object> 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<VolunteerInfoDTO> page = getPage(params);