Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -738,7 +738,7 @@
                      false AS isExpirat,
                      false AS isChanged
                  FROM group_act_info ai
-                 LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.SORT = 1
+                 LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
                  WHERE ai.DEL_FLAG = '0'
                     AND (
                         <foreach collection="ids" item="id" separator=" OR ">
@@ -898,7 +898,7 @@
         'no' AS isChange,
         IFNULL(ac2.CONTENT,'') AS firstPhoto
         FROM group_act_info ai
-        LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.SORT = 1
+        LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
         WHERE ai.DEL_FLAG = '0'
         AND (
         <foreach collection="ids" item="id" separator=" OR ">