Ver Fonte

Merge branch 'master' into pre

zoujiajian há 2 anos atrás
pai
commit
7b31091fca

+ 2 - 1
netflix-dao/src/main/resources/mapper/GroupRelationMapper.xml

@@ -323,7 +323,8 @@
     </select>
 
     <select id="getUserHasPayGoods" resultType="com.cyksj.model.views.RenewalView">
-        select g.id as goods_id,g.title from (select distinct groups_id from groups_relation where (expiry_time is null
+        select g.id as goods_id,g.title from (select distinct groups_id from groups_relation where status in
+        ('validity', 'outside') and (expiry_time is null
         or
         expiry_time > #{now}) and user_id != 0 and user_id in <foreach
             collection="list" item="item" open="(" separator="," close=")">