From cba1b6c681d99b79a2c8e62d66a33f625fa3fe10 Mon Sep 17 00:00:00 2001
From: wen <1455474577@qq.com>
Date: Tue, 4 Jan 2022 15:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=90=8E=E5=8F=B0=E5=8F=91=E7=A5=A8?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BA=86=E7=A7=9F=E6=88=B7id=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/invoice/controller/XhpcInvoiceController.java | 1 +
 .../com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java   | 5 +++++
 .../src/main/resources/mapper/XhpcInvoiceMapper.xml        | 7 +++++++
 3 files changed, 13 insertions(+)

diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java
index 646a9a4e..a01e9a0f 100644
--- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java
+++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/controller/XhpcInvoiceController.java
@@ -160,6 +160,7 @@ public class XhpcInvoiceController extends BaseController {
             return AjaxResult.error("要回显的订单发票id有误");
         }
         return AjaxResult.success(specificInvoiceWrap);
+
     }
 
 }
diff --git a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java
index 36e4609c..c178970b 100644
--- a/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java
+++ b/xhpc-modules/xhpc-invoice/src/main/java/com/xhpc/invoice/domain/AllInvoiceOrdersRequest.java
@@ -30,6 +30,11 @@ public class AllInvoiceOrdersRequest {
      */
     @JsonProperty("invoiceType")
     private Integer invoiceType;
+    /**
+     * 租户id
+     */
+    @JsonProperty("tenantId")
+    private String tenantId;
     /**
      * 发票状态（0表示未开票，1表示已经开票，2表示开票失败）
      */
diff --git a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml
index ed6251f8..ff90ebca 100644
--- a/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml
+++ b/xhpc-modules/xhpc-invoice/src/main/resources/mapper/XhpcInvoiceMapper.xml
@@ -74,6 +74,7 @@
         SELECT
         invoice_id,
         invoice_type,
+        tenant_id,
         creator,
         creator_type,
         invoice_money,
@@ -94,6 +95,9 @@
             <if test="invoiceType!=null">
                 and invoice_type = #{invoiceType}
             </if>
+            <if test="tenantId!=null">
+                and tenant_id = #{tenantId}
+            </if>
             <if test="status!=null">
                 and status = #{status}
             </if>
@@ -128,6 +132,9 @@
             <if test="invoiceType!=null">
                 and invoice_type = #{invoiceType}
             </if>
+            <if test="tenantId!=null">
+                and tenant_id = #{tenantId}
+            </if>
             <if test="status!=null">
                 and status = #{status}
             </if>