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

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/dao/GroupActContentDao.java

@@ -37,10 +37,9 @@ public interface GroupActContentDao extends BaseDao<GroupActContentEntity> {
      * 重新编辑活动提交，将原来的内容置为已删除
      *
      * @param groupActId 活动id
-     * @param userId     更新人
      * @return int
      */
-    int updateToDel(@Param("groupActId") String groupActId, @Param("userId") String userId);
+    int deleteByGroupActId(@Param("groupActId") String groupActId);
 
     /**
      * 活动内容，升序返回

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/act/service/impl/GroupActInfoServiceImpl.java

@@ -154,7 +154,7 @@ public class GroupActInfoServiceImpl extends BaseServiceImpl<GroupActInfoDao, Gr
         //1、插入活修改活动信息表
         if (StringUtils.isNotBlank(groupActInfoEntity.getId())) {
             //删除group_act_content、删除act_read_record
-            groupActContentDao.updateToDel(groupActInfoEntity.getId(), formDTO.getPublishUserId());
+            groupActContentDao.deleteByGroupActId(groupActInfoEntity.getId());
             actReadRecordDao.deleteByActId(groupActInfoEntity.getId());
             baseDao.updateById(groupActInfoEntity);
         } else {

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

@@ -3,14 +3,11 @@
 
 <mapper namespace="com.epmet.modules.act.dao.GroupActContentDao">
     <!-- 重新编辑活动提交，将原来的内容置为已删除  -->
-    <update id="updateToDel" parameterType="map">
-        UPDATE group_act_content
-        SET DEL_FLAG = '1',
-            UPDATED_BY = #{userId},
-            UPDATED_TIME = now()
+    <delete id="deleteByGroupActId" parameterType="java.lang.String">
+        delete from  group_act_content
         WHERE
             GROUP_ACT_ID = #{groupActId}
-    </update>
+    </delete>
 
     <!--  活动内容，升序返回  -->
     <select id="selectContentList" parameterType="map" resultType="java.lang.String">

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

@@ -739,7 +739,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 ">
@@ -914,7 +914,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 ">