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 @@
and invoice_type = #{invoiceType}
+
+ and tenant_id = #{tenantId}
+
and status = #{status}
@@ -128,6 +132,9 @@
and invoice_type = #{invoiceType}
+
+ and tenant_id = #{tenantId}
+
and status = #{status}