|
|
@@ -1301,7 +1301,7 @@
|
|
|
AND (s.membership_end_time_ < NOW() OR s.membership_end_time_ IS NULL)
|
|
|
</if>
|
|
|
</if>
|
|
|
- <if test="query.startDate != null and query.startDate != ''">
|
|
|
+ <if test="startDate != null and startDate != ''">
|
|
|
AND smcr.create_date_ BETWEEN #{startDate} AND #{endDate}
|
|
|
</if>
|
|
|
<if test="teacherId != null">
|
|
|
@@ -1311,7 +1311,7 @@
|
|
|
AND stm.subject_id_list_ = #{subjectId}
|
|
|
</if>
|
|
|
<if test="search != null and search != ''">
|
|
|
- AND (su.username_ LIKE CONCAT('%',#{query.search},'%') OR su.phone_ LIKE CONCAT('%',#{query.search},'%') OR su.id_ = #{query.search})
|
|
|
+ AND (su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%') OR su.id_ = #{search})
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|
