社会组织 -志愿者详情添加组织id

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

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);
     }
 

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