lmk-shop-java.git

			@@ -90,8 +90,8 @@
			LA.*
			FROM lmk_my_collect LMC
			LEFT JOIN lmk_activity LA
			ON LMC.ref_id = LA.id
			WHERE LMC.collect_type = 'activity' and LMC.user_id = #{userId}
			ON LMC.ref_id = LA.id AND LMC.delete_flag = 0
			WHERE LMC.collect_type = 'activity' and LMC.user_id = #{userId} AND LA.id IS NOT NULL
			</select>
			<resultMap id="videoBaseResult" type="cn.lili.modules.lmk.domain.vo.VideoVO">
			<id column="id" property="id"/>
			@@ -101,10 +101,7 @@
			<result column="video_file_key" property="videoFileKey" />
			<result column="video_fit" property="videoFit" />
			<result column="title" property="title" />
			<result column="goods_id" property="goodsId" />
			<result column="goods_view_num" property="goodsViewNum" />
			<result column="video_duration" property="videoDuration" />
			<result column="goods_order_num" property="goodsOrderNum" />
			<result column="recommend" property="recommend" />
			<result column="status" property="status" />
			<result column="play_num" property="playNum" />
			@@ -114,18 +111,6 @@
			<result column="audit_pass_time" property="auditPassTime" />
			<result column="update_time" property="updateTime" />
			</resultMap>

			<select id="getVideoCollectPage" resultMap="videoBaseResult">
			SELECT
			LV.*,
			LM.nick_name as authorName
			FROM lmk_my_collect LMC
			LEFT JOIN lmk_video LV
			ON LMC.ref_id = LV.id
			LEFT JOIN li_member LM ON LV.author_id = LM.id
			WHERE LMC.collect_type = 'video' and LMC.user_id = #{userId}
			and LV.delete_flag = 0 and LM.delete_flag= 0 and LMC.delete_flag =0
			</select>

			<resultMap id="storeBaseResult" type="cn.lili.modules.store.entity.vos.StoreBasicInfoVO">
			<id column="id" property="storeId"/>