|
@@ -1395,6 +1395,14 @@
|
|
|
<if test="organId != null and organId != ''">
|
|
|
AND FIND_IN_SET(su.organ_id_,#{organId})
|
|
|
</if>
|
|
|
+ <if test="null != hasMember">
|
|
|
+ <if test="1 == hasMember">
|
|
|
+ and s.membership_end_time_ > now()
|
|
|
+ </if>
|
|
|
+ <if test="0 == hasMember">
|
|
|
+ and (s.membership_end_time_ is null or t.membership_end_time_ <= now())
|
|
|
+ </if>
|
|
|
+ </if>
|
|
|
</where>
|
|
|
ORDER BY user_id_
|
|
|
<include refid="global.limit"></include>
|