Commit 0c4454e1 authored by zhangsen's avatar zhangsen

系统查询bug 冲突问题

parent 60bf9b31
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
f_fire_fighting_system as sys f_fire_fighting_system as sys
left join wl_warehouse_structure wws on wws.id = sys.contro_box_build left join wl_warehouse_structure wws on wws.id = sys.contro_box_build
where 1=1 where 1=1
<if test="equimentName != null and equimentName !='' "> <if test="equimentName != null and equimentName !='' and equimentCode !='null' ">
AND sys.NAME like CONCAT('%',#{equimentName},'%') AND sys.NAME like CONCAT('%',#{equimentName},'%')
</if> </if>
<if test="equimentCode != null and equimentCode !='' "> <if test="equimentCode != null and equimentCode !='' and equimentCode !='null' ">
AND sys.CODE like CONCAT('%',#{equimentCode},'%') AND sys.CODE like CONCAT('%',#{equimentCode},'%')
</if> </if>
<if test="nameOrCode != null and nameOrCode != ''"> <if test="nameOrCode != null and nameOrCode != ''">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment