From 5371e300810a6cff9e6b4bed64ec49c99689743f Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 19 Sep 2023 14:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java | 2 +-
 .../elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java  | 2 +-
 .../src/main/resources/mapper/VolunteerInfoDao.xml              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
index 38020c37..5f4378d4 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java
@@ -61,7 +61,7 @@ public interface VolunteerInfoDao extends BaseDao<VolunteerInfoEntity> {
     List<VolunteerInfoDTO> volunteerInfoList(Map<String, Object> params);
 
 
-    List<ScreenVolunteerInfoDTO> volunteerScreenInfoList();
+    List<ScreenVolunteerInfoDTO> volunteerScreenInfoList(Map<String, Object> params);
 
     ScreenVolunteerDetailDTO volunteerScreenDetail(@Param("volunteerId") String volunteerId);
 
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 47a1f2df..7d43e347 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
@@ -116,7 +116,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     @Override
     public PageData<ScreenVolunteerInfoDTO> screenPage(Map<String, Object> params) {
         IPage<VolunteerInfoDTO> page = getPage(params);
-        List<ScreenVolunteerInfoDTO> list = baseDao.volunteerScreenInfoList();
+        List<ScreenVolunteerInfoDTO> list = baseDao.volunteerScreenInfoList(params);
         return new PageData<>(list, page.getTotal());
     }
 
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
index 78951733..5eaf6d93 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml
@@ -365,7 +365,7 @@
         v.ID id,
         v.VOLUNTEER_NICKNAME volunteerNickname,
         v.KINDNESS_TIME kindnessTime,
-        v.REGIST_TIME volunteerFaceImg,
+        v.VOLUNTEER_FACE_IMG volunteerFaceImg,
         d.dept_name
         FROM
         epdc_volunteer_info v