活动修改

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml

@@ -349,7 +349,7 @@
         and relation.USER_ID = #{userId}
         and actInfo.ID = relation.ACT_ID
         LEFT JOIN ( SELECT count( * ) AS clockCount, ACT_USER_ID FROM epdc_act_user_clock_log WHERE DEL_FLAG = '0' GROUP BY ACT_USER_ID ) clock ON clock.ACT_USER_ID = relation.ID
-        LEFT JOIN esua_epdc_user.epdc_volunteer_info  volunteer ON  volunteer.USER_ID = relation.USER_ID AND volunteer.DEL_FLAG = '0'
+        LEFT JOIN esua_epdc_user.epdc_volunteer_info  volunteer ON  (volunteer.USER_ID = relation.USER_ID OR volunteer.USER_ID =#{userId}) AND volunteer.DEL_FLAG = '0'
         WHERE
         actInfo.DEL_FLAG = '0'
         AND actInfo.ID = #{id}