From 7441b65c350dcfa308d14078319a6d309177c4c5 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 26 Nov 2024 09:57:33 +0800
Subject: [PATCH 1/2] =?UTF-8?q?11/26=20=E8=8D=AF=E5=93=81=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=AF=B9=E7=85=A7=E6=9D=A1=E4=BB=B6sql=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/mapper/basic/UdiRelevanceDao.xml   | 18 +++++++++++++-----
 .../mapper/purchase/PurApplyDetailDao.xml      |  1 +
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index bf42f71d0..d74f10e90 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -668,16 +668,24 @@
             <if test="diType != '' and diType != null">
                 AND diType = #{diType}
             </if>
-            <if test="filterType != null and filterType == 1">
+            <if test="filterType != null and filterType == 1 and productsType == 1">
                 AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
                 thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
-                <if test="productsType == 1">
-                    and basic_products.originUuid <![CDATA[<>]]> ''
-                </if>
+                and basic_products.originUuid <![CDATA[<>]]> ''
             </if>
-            <if test="filterType != null and filterType == 2">
+            <if test="filterType != null and filterType == 1 and productsType == 2">
+                AND (thirdId <![CDATA[<>]]> '' or thirdId1 <![CDATA[<>]]> '' or thirdId2 <![CDATA[<>]]> '' or
+                thirdId3 <![CDATA[<>]]> '' or thirdId4 <![CDATA[<>]]> '')
+                and mainId <![CDATA[<>]]> ''
+            </if>
+            <if test="filterType != null and filterType == 2  and productsType == 1">
                 AND basic_products.originUuid is NULL
             </if>
+            <if test="filterType != null and filterType == 2 and productsType == 2">
+                AND  (thirdId = '' or  thirdId1 = ''
+                or  thirdId2 = '' or  thirdId3 = ''
+                or  thirdId4 = '') AND  mainId = ''
+            </if>
             <if test="filterType != null and filterType == 3">
                 AND (mainId is NULL or mainId = '')
                 <if test="productsType == 1">
diff --git a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
index c16a78039..cfac07018 100644
--- a/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
+++ b/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml
@@ -25,6 +25,7 @@
                pur_apply_detail.*,
                basic_products.nameCode nameCode,
                basic_products.ggxh     spec,
+               basic_products.bzgg,
                basic_products.packUnit,
                basic_products.manufactory,
                basic_products.ylqxzcrbarmc,

From ae63015073dbe931eb3a47011b697b88f30caf15 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Tue, 26 Nov 2024 10:16:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?11/26=20sql=E4=BC=98=E5=8C=961.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index d74f10e90..74239c55a 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -682,9 +682,9 @@
                 AND basic_products.originUuid is NULL
             </if>
             <if test="filterType != null and filterType == 2 and productsType == 2">
-                AND  (thirdId = '' or  thirdId1 = ''
-                or  thirdId2 = '' or  thirdId3 = ''
-                or  thirdId4 = '') AND  mainId = ''
+                AND  ((thirdId = '' or thirdId is null)  or  (thirdId1 = '' or thirdId1 is null)
+                or  (thirdId2 = '' or thirdId2 is null) or  (thirdId3 = '' or thirdId3 is null)
+                or  (thirdId4 = '' or thirdId4 is null)) AND (mainId = '' or mainId is null)
             </if>
             <if test="filterType != null and filterType == 3">
                 AND (mainId is NULL or mainId = '')