diff --git a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
index 41a72c9a..50dfc995 100644
--- a/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/CustomsMapper.xml
@@ -148,21 +148,9 @@
and t.account_period = #{accountPeriod}
-
- and (t.comp_code in
-
- #{companyCode}
-
- or t.comp_code is null or t.comp_code = ''
- )
-
- and t.comp_code = #{companyCode}
+ and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
-
- and (t.comp_code = '' or t.comp_code is null)
-
-
order by t.fill_in_date desc
diff --git a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
index 5b188305..1a8afd58 100644
--- a/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/ExtPaperMapper.xml
@@ -165,19 +165,8 @@
and bzr like concat('%',#{bzr},'%')
-
- and (comp_code in
-
- #{companyCode}
-
- or comp_code is null or comp_code = ''
- )
-
- and comp_code = #{companyCode}
-
-
- and (comp_code is null or comp_code = '')
+ and (comp_code = #{companyCode} or comp_code is null or comp_code = '')
GROUP BY uuid having min(create_date)
ORDER BY create_date DESC