From 7c32a48f56066f4c3baaa500e427c60792ad99a7 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Wed, 27 May 2020 22:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/controller/ApiAppUserController.java   | 3 ++-
 .../main/java/com/elink/esua/epdc/service/AppUserService.java  | 3 ++-
 .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java   | 3 ++-
 .../esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
index 73682fcb..e9f7b109 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java
@@ -332,13 +332,14 @@ public class ApiAppUserController {
 
     /*
      * 志愿者列表
+     * @param tokenDto
      * @param dto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
      * @Author zhangyong
      * @Date 15:33 2020-05-18
      **/
     @GetMapping("volunteer/list")
-    public Result<List<EpdcAppVolunteerListResultDTO>> volunteerList(EpdcAppVolunteerListFormDTO dto) {
+    public Result<List<EpdcAppVolunteerListResultDTO>> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
         ValidatorUtils.validateEntity(dto);
         return appUserService.listVolunteer(dto);
     }
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
index 1c973010..675ebb90 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java
@@ -263,12 +263,13 @@ public interface AppUserService {
 
     /*
      * 志愿者列表
+     * @param tokenDto
      * @param dto
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO>>
      * @Author zhangyong
      * @Date 15:33 2020-05-18
      **/
-    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto);
+    Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto);
 
     /**
      * 志愿者认证 V2接口
diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
index 2f5529d7..1ae967e4 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java
@@ -1426,7 +1426,8 @@ public class AppUserServiceImpl implements AppUserService {
     }
 
     @Override
-    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(EpdcAppVolunteerListFormDTO dto) {
+    public Result<List<EpdcAppVolunteerListResultDTO>> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) {
+        dto.setGridId(tokenDto.getGridId());
         return userFeignClient.listVolunteer(dto);
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java
index 4e90ffcb..5b76ff64 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java
@@ -29,5 +29,5 @@ public class EpdcAppVolunteerListFormDTO {
     /**
      * 数据权限
      */
-    private String gridId;
+    private Long gridId;
 }