Merge branch 'master' into pre

netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -211,10 +211,13 @@
         when category = 3 then 755
         else 666 end
         ) as sorted
-        from `goods_don` where id not in
-        <foreach collection="list" item="item" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        from `goods_don` where deleted is true and status is true
+        <if test="list!=null and list.size()>0">
+            and id not in
+            <foreach collection="list" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="isPayNf">
             and type in (1,2)
         </if>
@@ -222,9 +225,9 @@
             and type = 1
         </if>
         <if test="filterCourseGoods!=null and filterCourseGoods">
-            (and special_type is null or special_type != 'courseware')
+            and (special_type is null or special_type != 'courseware')
         </if>
-        and deleted is true and status is true) s order by s.sorted desc,sort_by asc
+        ) s order by s.sorted desc,sort_by asc
     </select>
 
     <select id="getOutSideGroupsTripsRelationByGoodsId" resultType="java.lang.Long">