Commit 3bad6998 authored by chenzhao's avatar chenzhao

Merge branch 'develop_dl_plan6_temp' of…

Merge branch 'develop_dl_plan6_temp' of http://39.98.45.134:8090/moa/amos-boot-biz into develop_dl_plan6_temp
parents 76d97cb5 56a34467
...@@ -200,7 +200,7 @@ ...@@ -200,7 +200,7 @@
'$' '$'
)</if> )</if>
AND p.is_delete = 0 AND p.is_delete = 0
and ( select COUNT(p_point_classify.id) fROM p_point_classify where p_point_classify.point_id =p.id) >0 and ( select COUNT(p_point_inputitem.id) fROM p_point_inputitem where p_point_inputitem.point_id =p.id) >0
<if test="name!=null"> AND ( p.point_no LIKE CONCAT('%', #{name},'%') <if test="name!=null"> AND ( p.point_no LIKE CONCAT('%', #{name},'%')
OR p.NAME LIKE CONCAT('%', #{name},'%')) </if> OR p.NAME LIKE CONCAT('%', #{name},'%')) </if>
<if test="query != null and query != ''"> <if test="query != null and query != ''">
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
'$' '$'
)</if> )</if>
AND p.is_delete = 0 AND p.is_delete = 0
and ( select COUNT(p_point_classify.id) fROM p_point_classify where p_point_classify.point_id =p.id) >0 and ( select COUNT(p_point_inputitem.id) fROM p_point_inputitem where p_point_inputitem.point_id =p.id) >0
<if test="name!=null"> AND ( p.point_no LIKE CONCAT('%', #{name},'%') <if test="name!=null"> AND ( p.point_no LIKE CONCAT('%', #{name},'%')
OR p.NAME LIKE CONCAT('%', #{name},'%')) </if> OR p.NAME LIKE CONCAT('%', #{name},'%')) </if>
...@@ -1120,7 +1120,7 @@ ...@@ -1120,7 +1120,7 @@
<if test="bizOrgCode != null and bizOrgCode != '' "> <if test="bizOrgCode != null and bizOrgCode != '' ">
AND PP.biz_org_code LIKE CONCAT (#{bizOrgCode},'%') AND PP.biz_org_code LIKE CONCAT (#{bizOrgCode},'%')
</if> </if>
and ( select COUNT(p_point_classify.id) fROM p_point_classify where p_point_classify.point_id =pp.id) >0 and ( select COUNT(p_point_inputitem.id) fROM p_point_inputitem where p_point_inputitem.point_id =pp.id) >0
AND pp.is_delete = 0 AND pp.is_delete = 0
</where> </where>
</select> </select>
...@@ -1191,7 +1191,7 @@ ...@@ -1191,7 +1191,7 @@
<if test="bizOrgCode != null and bizOrgCode != '' "> <if test="bizOrgCode != null and bizOrgCode != '' ">
AND PP.biz_org_code LIKE CONCAT (#{bizOrgCode},'%') AND PP.biz_org_code LIKE CONCAT (#{bizOrgCode},'%')
</if> </if>
and ( select COUNT(p_point_classify.id) fROM p_point_classify where p_point_classify.point_id =pp.id) >0 and ( select COUNT(p_point_inputitem.id) fROM p_point_inputitem where p_point_inputitem.point_id =pp.id) >0
AND pp.is_delete = 0 AND pp.is_delete = 0
</where> </where>
LIMIT #{offset}, #{size} LIMIT #{offset}, #{size}
......
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