update

mec-biz/src/main/resources/config/mybatis/VipGroupActivityMapper.xml

@@ -31,12 +31,12 @@
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="VipGroupActivity" >
-		SELECT * FROM vip_group_activity WHERE id_ = #{id} 
+		SELECT * FROM vip_group_activity WHERE id_ = #{id}
 	</select>
 	
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="VipGroupActivity">
-		SELECT * FROM vip_group_activity ORDER BY id_
+		SELECT * FROM vip_group_activity WHERE del_flag_=0 ORDER BY id_
 	</select>
 	
 	<!-- 向数据库增加一条记录 -->
@@ -111,12 +111,13 @@
 	
 	<!-- 根据主键删除一条记录 -->
 	<delete id="delete" >
-		DELETE FROM vip_group_activity WHERE id_ = #{id}
+		UPDATE vip_group_activity SET del_flag_=1 WHERE id_ = #{id}
 	</delete>
 
 	<sql id="queryCondition">
 		<where>
-			organ_id_=#{organId}
+			del_flag_=0
+			AND organ_id_=#{organId}
 		</where>
 	</sql>
 
@@ -146,8 +147,9 @@
 		WHERE
 			FIND_IN_SET( #{categoryId}, vip_group_category_id_list_ )
 			AND NOW() &lt; end_time_
+			AND del_flag_=0
 	</select>
     <select id="queryNamesById" resultType="java.util.Map">
-		SELECT vga.id_ `key`,vga.name_ `value` FROM vip_group_activity vga WHERE FIND_IN_SET(vga.id_,#{activityIds})
+		SELECT vga.id_ `key`,vga.name_ `value` FROM vip_group_activity vga WHERE FIND_IN_SET(vga.id_,#{activityIds}) AND del_flag_=0
 	</select>
 </mapper>