From 970584b13a9b9afbc5755c2d9e76e393bba23c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= Date: Fri, 17 Jan 2020 10:46:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/activity/ActInfoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml index 5c86bcd06..4e7e5db2a 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActInfoDao.xml +++ b/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}