bug优化1209

src/main/resources/mybatis/information/PcdeDetailMapper.xml

@@ -4,7 +4,6 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zg.project.information.mapper.PcdeDetailMapper">
 
-
     <resultMap type="PcdeDetail" id="PcdeDetailResult">
         <result property="id"             column="id"/>
         <result property="pcode"          column="pcode"/>
@@ -36,16 +35,21 @@
         <where>
             <if test="pcode != null and pcode != ''">and d.pcode = #{pcode}</if>
             <if test="scene != null and scene != ''">and d.scene = #{scene}</if>
-            <if test="warehouse != null and warehouse != ''">and d.warehouse = #{warehouse}</if>
+
+            <if test="warehouseName != null and warehouseName != ''">
+                and w.warehouse_name like concat('%', #{warehouseName}, '%')
+            </if>
+
+            <if test="warehouse != null and warehouse != ''">
+                and d.warehouse = #{warehouse}
+            </if>
+
             <if test="encodedId != null and encodedId != ''">and d.encoded_id = #{encodedId}</if>
             <if test="tag != null and tag != ''">and d.tag = #{tag}</if>
             <if test="isDelete != null">and d.is_delete = #{isDelete}</if>
-            <if test="createdBy != null and createdBy != ''">and d.created_by = #{createdBy}</if>
-            <if test="createdAt != null">and d.created_at = #{createdAt}</if>
-            <if test="updatedBy != null and updatedBy != ''">and d.updated_by = #{updatedBy}</if>
-            <if test="updatedAt != null">and d.updated_at = #{updatedAt}</if>
         </where>
     </select>
+
     <select id="selectPcdeDetailListIds" parameterType="PcdeDetail" resultMap="PcdeDetailResult">
         <include refid="selectPcdeDetailVo"/>
         <where>
@@ -156,7 +160,6 @@
         </foreach>
     </insert>
 
-
     <delete id="deletePcdeDetailById" parameterType="Long">
         delete from pcde_detail where id = #{id}
     </delete>