From 372e4605380d13fd89827090d9d978bcaff06b30 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Wed, 16 Jul 2025 17:30:22 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81prop6-propValue6=20:::=20=E6=9F=A5?=
 =?UTF-8?q?=E8=A1=A8,=20=20=20=20prop7-propValue7=20:::=20=E6=9F=A5?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=90=9C=E7=B4=A2=E6=A1=86,=20=20=20=20prop8?=
 =?UTF-8?q?-propValue8=20:::=20=E6=9F=A5=E8=A1=A8=E7=9A=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml   | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml b/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
index 1d75350f..199a1414 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/voucher/ae/comf/bd/entity/vo/MdmDBQueryVO.xml
+++ b/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>