1、prop6-propValue6 ::: 查表,

prop7-propValue7 ::: 查表的搜索框,
   prop8-propValue8 ::: 查表的搜索框

base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml

@@ -7,24 +7,31 @@
     </resultMap>
 
 
+    <!--
+        prop6-propValue6 ::: 查表
+        prop7-propValue7 ::: 查表的搜索框
+        prop8-propValue8 ::: 查表的搜索框
+    -->
     <select id="queryMdmDb" parameterType="com.hzya.frame.voucher.ae.comf.bd.entity.vo.MdmDBQueryVO" resultType="map">
         select
         *
         from
         ${tablename}
         <trim prefix="where" prefixOverrides="and">
+            <if test="pkentityorg !=null and pkentityorg != null">pk_corp= #{pkentityorg}</if>
 
             <if test="prop1 !=null and propValue1 != null">${prop1} like concat('%', #{propValue1},'%')</if>
             <if test="prop2 !=null and propValue2 != null">${prop2}like concat('%', #{propValue2},'%')</if>
             <if test="prop3 !=null and propValue3 != null">${prop3}like concat('%', #{propValue3},'%')</if>
             <if test="prop4 !=null and propValue4 != null">${prop4}like concat('%', #{propValue4},'%')</if>
             <if test="prop5 !=null and propValue5 != null">${prop5}like concat('%', #{propValue5},'%')</if>
+
             <if test="prop6 !=null and propValue6 != null">${prop6}=#{propValue6}</if>
-            <if test="prop7 !=null and propValue7 != null">${prop7}=#{propValue7}</if>
+
-            <if test="prop8 !=null and propValue8 != null">${prop8}=#{propValue8}</if>
+            <if test="prop7 !=null and propValue7 != null">and ${prop7}=#{propValue7}</if>
+            <if test="prop8 !=null and propValue8 != null">or ${prop8}=#{propValue8}</if>
             <if test="prop9 !=null and propValue9 != null">${prop9}=#{propValue9}</if>
             <if test="prop10 !=null and propValue10 != null">${prop10}=#{propValue10}</if>
-            <if test="pkentityorg !=null and pkentityorg != null">pk_corp= #{pkentityorg}</if>
         </trim>
     </select>