Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-supervision/src/main/resources/db/mapper/routePointItemMapper.xml

@@ -49,14 +49,16 @@
             COUNT(1)
         FROM
             p_route_point_item pi
-        LEFT JOIN p_input_item i ON i.id = pi.input_item_id
-        <if test="name!=null"> and i.name like concat(concat("%",#{name}),"%")</if>
-        <if test="itemTypeClassifyIds != null and itemTypeClassifyIds != ''"> and i.item_type_classify_ids = #{itemTypeClassifyIds}</if>
-        <if test="planId!=null"> and pi.plan_id = #{planId} </if>
-        <if test="orgCode!=null"> and i.org_Code = #{orgCode}</if>
+            LEFT JOIN p_input_item i ON i.id = pi.input_item_id
+        <where>
+            <if test="name!=null"> and i.name like concat(concat("%",#{name}),"%")</if>
+            <if test="itemTypeClassifyIds != null and itemTypeClassifyIds != ''"> and i.item_type_classify_ids = #{itemTypeClassifyIds}</if>
+            <if test="planId!=null"> and pi.plan_id = #{planId} </if>
+            <if test="orgCode!=null"> and i.org_Code = #{orgCode}</if>
+        </where>
     </select>
     <!--查询 -->
-    <select id="queryPage" resultMap="com.yeejoin.amos.supervision.business.vo.RoutePointItemVo">
+    <select id="queryPage" resultType="com.yeejoin.amos.supervision.business.vo.RoutePointItemVo">
         SELECT
         pi.id,
         i.id AS itemId,
@@ -69,10 +71,12 @@
         FROM
         p_route_point_item pi
         LEFT JOIN p_input_item i ON i.id = pi.input_item_id
-        <if test="name!=null"> and i.name like concat(concat("%",#{name}),"%")</if>
-        <if test="itemTypeClassifyIds != null and itemTypeClassifyIds != ''"> and i.item_type_classify_ids = #{itemTypeClassifyIds}</if>
-        <if test="planId!=null"> and pi.plan_id = #{planId} </if>
-        <if test="orgCode!=null"> and i.org_Code = #{orgCode}</if>
+        <where>
+            <if test="name!=null"> and i.name like concat(concat("%",#{name}),"%")</if>
+            <if test="itemTypeClassifyIds != null and itemTypeClassifyIds != ''"> and i.item_type_classify_ids = #{itemTypeClassifyIds}</if>
+            <if test="planId!=null"> and pi.plan_id = #{planId} </if>
+            <if test="orgCode!=null"> and i.org_Code = #{orgCode}</if>
+        </where>
         <choose>
             <when test="pageSize==-1"></when>
             <when test="pageSize!=-1">limit #{offset},#{pageSize}</when>