Skip to content

Y
YeeAmosFireAutoSysRoot
Commit 401bdb47 authored by 田涛's avatar 田涛
Browse files
Options

Merge remote-tracking branch 'origin/dev_upgrade-1225' into dev_upgrade-1225

parents 12a141ff 2b1edd88
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_impt_equip.xml
View file @ 401bdb47
...@@ -36,10 +36,11 @@ ...@@ -36,10 +36,11 @@
eq.address, eq.address,
eq.building, eq.building,
eq.room, eq.room,
frs.name riskSourceName if (frs.name is null,frss.name,frs.name) as riskSourceName
FROM FROM
f_equipment eq f_equipment eq
left join f_risk_source frs on frs.id = eq.risk_source_id left join f_risk_source frs on frs.id = eq.risk_source_id
left join f_risk_source frss on frss.source_id = eq.risk_source_id
<trim prefix="WHERE" prefixOverrides="AND "> <trim prefix="WHERE" prefixOverrides="AND ">
<if test="name !=null and name != ''"> and (eq.name like concat(concat("%",#{name}),"%") or eq.code like concat(concat("%",#{name}),"%"))</if> <if test="name !=null and name != ''"> and (eq.name like concat(concat("%",#{name}),"%") or eq.code like concat(concat("%",#{name}),"%"))</if>
<if test="id != null and id != ''"> and eq.id = #{id}</if> <if test="id != null and id != ''"> and eq.id = #{id}</if>
......
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