|
@@ -50,11 +50,18 @@
|
|
|
FROM sys_suggestion t
|
|
|
LEFT JOIN sys_suggestion_type sst on t.suggestion_type_id_ = sst.id_
|
|
|
<if test="param.keyword!=null and param.keyword.trim()!=''">
|
|
|
- LEFT JOIN sys_account su ON su.id_ = t.user_id_
|
|
|
+ LEFT JOIN sys_user su2 ON su2.id_ = t.user_id_
|
|
|
</if>
|
|
|
- <where>
|
|
|
+ <if test="param.handleName != null and param.handleName.trim() != ''">
|
|
|
+ LEFT JOIN sys_user su ON su.id_ = t.handle_by_
|
|
|
+ </if>
|
|
|
+ <where>
|
|
|
<if test="param.keyword!=null and param.keyword.trim()!=''">
|
|
|
- AND su.username_ LIKE CONCAT('%', #{param.keyword}, '%')
|
|
|
+ AND (
|
|
|
+ su2.username_ LIKE CONCAT('%', #{param.keyword}, '%')
|
|
|
+ or
|
|
|
+ su2.phone_ LIKE CONCAT('%', #{param.keyword}, '%')
|
|
|
+ )
|
|
|
</if>
|
|
|
<if test="param.type != null">
|
|
|
AND t.type_ = #{param.type}
|
|
@@ -80,6 +87,9 @@
|
|
|
<if test="param.handleBy != null">
|
|
|
AND t.handle_by_ = #{param.handleBy}
|
|
|
</if>
|
|
|
+ <if test="param.handleName != null and param.handleName.trim() != ''">
|
|
|
+ AND su.username_ LIKE CONCAT('%', #{param.handleName}, '%')
|
|
|
+ </if>
|
|
|
<if test="param.handStartTime != null">
|
|
|
AND t.handle_time_ >= #{param.handStartTime}
|
|
|
</if>
|