|
|
@@ -151,7 +151,7 @@
|
|
|
LEFT JOIN sys_user su ON su.id_ = s.user_id_
|
|
|
LEFT JOIN organization o ON o.id_ = su.organ_id_
|
|
|
<include refid="queryPageSql"/>
|
|
|
- ORDER BY activity_course_detail_ DESC
|
|
|
+ ORDER BY s.activity_course_detail_ DESC
|
|
|
<include refid="global.limit"/>
|
|
|
</select>
|
|
|
|
|
|
@@ -166,7 +166,7 @@
|
|
|
<if test="organId != null">
|
|
|
AND su.organ_id_ = #{organId}
|
|
|
</if>
|
|
|
- <if test="search != null">
|
|
|
+ <if test="search != null and search != ''">
|
|
|
AND (s.user_id_ = #{search} OR su.username_ LIKE CONCAT('%', #{search}, '%') OR su.phone_ LIKE CONCAT('%', #{search}, '%'))
|
|
|
</if>
|
|
|
</where>
|
zouxuan