Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx
This commit is contained in:
commit
7120ffad8b
|
|
@ -578,7 +578,7 @@
|
||||||
</if>
|
</if>
|
||||||
|
|
||||||
<if test="record.keyWord != null and record.keyWord != ''">
|
<if test="record.keyWord != null and record.keyWord != ''">
|
||||||
AND bai.agreement_code like concat('%', #{record.keyWord}, '%')
|
AND (bai.agreement_code like concat('%', #{record.keyWord}, '%') or tt.code like concat('%', #{record.keyWord}, '%'))
|
||||||
</if>
|
</if>
|
||||||
GROUP BY tt.task_id
|
GROUP BY tt.task_id
|
||||||
ORDER BY tt.update_time DESC
|
ORDER BY tt.update_time DESC
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue