From c082e0e6ea691e2e4bc2ad13a35f022e9eee6974 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 22 Aug 2023 11:25:51 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=A5=A8=E6=B1=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/CustomsMapper.xml    | 14 +-------------
 .../src/main/resources/mapper/ExtPaperMapper.xml   | 13 +------------
 2 files changed, 2 insertions(+), 25 deletions(-)

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 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
-            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
-                #{companyCode}
-            </foreach>
-            or t.comp_code is null or t.comp_code = ''
-            )
-        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and t.comp_code = #{companyCode}
+            and (t.comp_code = #{companyCode} and t.comp_code = '' or t.comp_code is null)
         </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
-            and (t.comp_code = '' or t.comp_code is null)
-        </if>
-
         order by t.fill_in_date desc
     </select>
 
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 @@
         <if test="bzr != null and bzr != '' and bzr != 'null'">
             and bzr like concat('%',#{bzr},'%')
         </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (comp_code in
-            <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
-                #{companyCode}
-            </foreach>
-            or comp_code is null or comp_code = ''
-            )
-        </if>
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode != '88'">
-            and comp_code = #{companyCode}
-        </if>
-        <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode != '99' and companyCode == '88'">
-            and (comp_code is null or comp_code = '')
+            and (comp_code = #{companyCode} or comp_code is null or comp_code = '')
         </if>
         GROUP BY uuid having min(create_date)
         ORDER BY create_date DESC