From 59fa5e0a2077b4fd676254d2e5a713e90545844e Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 6 Jul 2023 13:54:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=BB=BC=E5=90=88=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/BbfpzhMapper.xml    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml
index 8bacb515..5d05acb9 100644
--- a/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/BbfpzhMapper.xml
@@ -71,6 +71,20 @@
         <foreach collection="gfsh" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+        <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 != '99' and companyCode != '88' and companyCode != '' and companyCode != 'null'" >
+            and t.comp_code = #{companyCode}
+        </if>
+        <if test="companyCode != null and companyCode != ''  and companyCode == '88'">
+            and (t.comp_code = '' or t.comp_code is null)
+        </if>
         <if test="bzdh != null and bzdh != '' and bzdh != 'null'">
             and t.bzdh = #{bzdh}
         </if>
@@ -191,7 +205,6 @@
         <if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
             and t.account_period = #{accountPeriod}
         </if>
-        order by t.invoice_date desc
     </select>
     <select id="selectByPramsMap" parameterType="java.util.Map"
             resultMap="BaseResultMap" databaseId="oracle">