志愿服务 SQL 增加判断条件

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcScreenDao.xml

@@ -613,7 +613,7 @@
             IFNULL(SUM(TIMESTAMPDIFF(MINUTE, i.ACT_START_TIME, i.ACT_END_TIME)), 0) serviceTime,
             100 satisfaction
         FROM yushan_esua_epdc_mutuality.epdc_volunteer_org vo
-        LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON vo.ID = vor.VOLUNTEER_ORG_ID
+        LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON vo.ID = vor.VOLUNTEER_ORG_ID AND vor.DEL_FLAG = '0'
         LEFT JOIN yushan_esua_epdc_mutuality.epdc_act_info i ON i.VACT_ID = vor.VACT_ID AND i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1'
 
         WHERE vo.del_flag = 0 AND vo.is_open = '0'
@@ -640,7 +640,7 @@
             i.ACT_CONTENT actContent,
             i.SPONSOR sponsor
         FROM yushan_esua_epdc_mutuality.epdc_act_info i
-        LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON i.VACT_ID = vor.VACT_ID
+        LEFT JOIN yushan_esua_epdc_mutuality.epdc_vact_org_relation vor ON i.VACT_ID = vor.VACT_ID AND vor.DEL_FLAG = '0'
         LEFT JOIN yushan_esua_epdc_mutuality.epdc_volunteer_org vo ON vo.ID = vor.VOLUNTEER_ORG_ID AND vo.del_flag = 0
 
         WHERE i.ACT_TYPE = '1' AND i.DEL_FLAG = '0' AND i.ACT_STATUS = '1' AND vo.is_open = '0'