From 618ef87a163257b2ae28fa733c754b04615aef15 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 28 Sep 2021 17:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E7=BB=84=E7=BB=87=20-?=
 =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esua/epdc/modules/volunteer/dao/VolunteerDao.java      | 7 ++-----
 .../volunteer/service/impl/VolunteerServiceImpl.java       | 2 +-
 .../src/main/resources/mapper/volunteer/VolunteerDao.xml   | 1 +
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java
index 0a8276a..f56efd0 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerDao.java
@@ -19,10 +19,7 @@ package com.elink.esua.epdc.modules.volunteer.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerEntity;
-import com.elink.esua.epdc.volunteer.AppVolunteerDetailDTO;
-import com.elink.esua.epdc.volunteer.AppVorgFormDTO;
-import com.elink.esua.epdc.volunteer.VolunteerListResultDTO;
-import com.elink.esua.epdc.volunteer.VolunteerPageDTO;
+import com.elink.esua.epdc.volunteer.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -72,7 +69,7 @@ public interface VolunteerDao extends BaseDao<VolunteerEntity> {
     * @params [userId]
     * @return com.elink.esua.epdc.volunteer.AppVolunteerDetailDTO
     */
-    AppVolunteerDetailDTO selectAppDetailById(@Param("userId") String userId);
+    AppVolunteerDetailDTO selectAppDetailById(AppVolunteerApplyDTO formDto);
 
     /**
     * @describe: 通过用户id查询关联的组织id
diff --git a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java
index c16a4f2..9a36c24 100644
--- a/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java
+++ b/epdc-cloud-heart/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerServiceImpl.java
@@ -113,7 +113,7 @@ public class VolunteerServiceImpl extends BaseServiceImpl<VolunteerDao, Voluntee
     @Override
     public Result getVolunteerDetail(AppVolunteerApplyDTO formDto) {
         log.info("getVolunteerDetail:"+formDto);
-        AppVolunteerDetailDTO result = baseDao.selectAppDetailById(formDto.getUserId());
+        AppVolunteerDetailDTO result = baseDao.selectAppDetailById(formDto);
         return new Result().ok(result);
     }
 
diff --git a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml
index 24cdcdf..0af3635 100644
--- a/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml
+++ b/epdc-cloud-heart/src/main/resources/mapper/volunteer/VolunteerDao.xml
@@ -104,6 +104,7 @@
         LEFT JOIN epdc_volunteer_org o on v.VOLUNTEER_ORG_ID=o.id and o.del_flag='0'
         where v.DEL_FLAG='0'
 			  and v.USER_ID=#{userId}
+              and v.VOLUNTEER_ORG_ID=#{volunteerOrgId}
     </select>
     <select id="getOrgIdListByUserId" resultType="java.lang.Long">
         SELECT r.VOLUNTEER_ORG_ID