Commit 04146637 authored by zhengjiawei's avatar zhengjiawei

bug

parent 0084c668
...@@ -30,17 +30,16 @@ ...@@ -30,17 +30,16 @@
<!--分页查询 --> <!--分页查询 -->
<select id="getEquipPage" resultType="java.util.HashMap"> <select id="getEquipPage" resultType="java.util.HashMap">
SELECT SELECT
eq.id, eq.id,
eq.`code`, eq.`code`,
eq.`name`, eq.`name`,
eq.address, eq.address,
eq.building, eq.building,
eq.room, eq.room,
if (frs.name is null,frss.name,frs.name) as riskSourceName frs.full_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 wl_warehouse_structure 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