From dc2458b74abe352886e19672535f37ce9a255ef1 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Tue, 22 Aug 2023 09:48:24 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=20=E7=AD=BE=E6=94=B6=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/dxhy/core/controller/ExcelController.java    | 2 ++
 dxhy-core/src/main/resources/mapper/QsxxMapper.xml             | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java
index 5fe36973..d37ad1a6 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/ExcelController.java
@@ -187,7 +187,9 @@ public class ExcelController extends AbstractController {
         if (StringUtils.isNotBlank(condition)) {
             JSONObject prams = JSONObject.parseObject(condition);
             String gfsh = prams.getString("gfsh");
+            String companyCode = prams.getString("companyCode");
             prams.put("business", getUserInfo().getBusiness());
+            prams.put("companyCode", companyCode);
             // 非查验综合查询、查验明细导出处理
             if (!"30".equals(serviceType) && !"29".equals(serviceType)) {
 
diff --git a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
index aa761cd0..cde4c27d 100644
--- a/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/QsxxMapper.xml
@@ -39,6 +39,9 @@
         <if test="gfsh != null and gfsh != '' and gfsh != 'null' and gfshFlag != '99' ">
             and t.gf_tax_no = #{gfsh}
         </if>
+        <if test="companyCode != null and companyCode != '' and companyCode != 'null'">
+            and (r.comp_code = #{companyCode} or r.comp_code = '' or r.comp_code is null)
+        </if>
         <if test="voucherNumber != null and voucherNumber != ''">
             and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
         </if>