From 304160c8d0f88e68fcf028e03a8cab2c0f746c79 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 15 Jun 2023 22:45:58 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E5=A2=9E=E5=8A=A0=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E6=9C=AA=E5=85=A5=E8=B4=A6=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml | 3 +--
 dxhy-core/src/main/resources/mapper/FpZhMapper.xml       | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
index da118c51..5c675024 100644
--- a/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
+++ b/dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
@@ -105,11 +105,10 @@
 <!--            #{companyCode}-->
 <!--        </foreach>-->
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
+            and t.comp_code in
             <foreach collection="companyCodes" index="index" item="companyCode" separator="," open="(" close=")">
                 #{companyCode}
             </foreach>
-            )
         </if>
         <!-- or t.comp_code is null or t.comp_code = ''-->
         <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
diff --git a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
index 8eb03a68..b56d1da0 100644
--- a/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/FpZhMapper.xml
@@ -604,14 +604,12 @@
         <!--            #{companyCode}-->
         <!--        </foreach>-->
         <if test="companyCode != null and companyCode != '' and companyCode != 'null' and companyCode == '99'">
-            and (t.comp_code in
+            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>
-
+        <!--or t.comp_code is null or t.comp_code = '' -->
         <if test="companyCode != null and companyCode != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
             and t.comp_code = #{companyCode}
         </if>