diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index bf42f71d0..74239c55a 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -668,16 +668,24 @@
AND diType = #{diType}
-
+
AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or
thirdId3 ]]> '' or thirdId4 ]]> '')
-
- and basic_products.originUuid ]]> ''
-
+ and basic_products.originUuid ]]> ''
-
+
+ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or
+ thirdId3 ]]> '' or thirdId4 ]]> '')
+ and mainId ]]> ''
+
+
AND basic_products.originUuid is NULL
+
+ 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)
+
AND (mainId is NULL or mainId = '')
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,