From fb2997aa2bf4db57381142cf02ff3d8c32796c5b Mon Sep 17 00:00:00 2001
From: BrandWang <rj090123@163.com>
Date: Mon, 15 May 2023 10:35:55 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=8F=AF=E5=9B=9E=E6=BA=AF):=20=E5=A4=9A?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加租户查询列表服务
---
 .../wabestway/recall/trace/dto/RecallOrderDTO.java    |  2 ++
 .../main/resources/mapper/trace/RecallOrderDao.xml    |  3 +++
 .../trace/controller/RecallOrderController.java       | 11 +++++++++++
 3 files changed, 16 insertions(+)

diff --git a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java
index 12edece..712c29c 100644
--- a/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java
+++ b/afis-recall-service/src/main/java/com/wabestway/recall/trace/dto/RecallOrderDTO.java
@@ -22,6 +22,8 @@ public class RecallOrderDTO extends PageDTO implements Serializable {
 	/** 主键 */
     @ApiModelProperty(value = "主键")
     private String id;
+    @ApiModelProperty(value = "租户ID")
+    private String tenantId;
 	/** 产品编码 */
     @ApiModelProperty(value = "产品编码")
     private String productCode;
diff --git a/afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml b/afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml
index c0253a2..cd47806 100644
--- a/afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml
+++ b/afis-recall-service/src/main/resources/mapper/trace/RecallOrderDao.xml
@@ -41,6 +41,9 @@
         <if test="recallOrderDTO.id != null  and recallOrderDTO.id != '' ">
             and t.id = #{recallOrderDTO.id}
         </if>
+        <if test="recallOrderDTO.tenantId != null  and recallOrderDTO.tenantId != '' ">
+            and t.tenant_id = #{recallOrderDTO.tenantId}
+        </if>
         <if test="recallOrderDTO.productCode != null  and recallOrderDTO.productCode != '' ">
             and t.product_code = #{recallOrderDTO.productCode}
         </if>
diff --git a/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java
index 21d0a63..1f6fdeb 100644
--- a/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java
+++ b/afis-recall-web/src/main/java/com/wabestway/recall/trace/controller/RecallOrderController.java
@@ -1,6 +1,7 @@
 package com.wabestway.recall.trace.controller;
 
 
+import com.wabestway.recall.util.HeaderDataUtil;
 import org.springframework.web.bind.annotation.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -31,9 +32,19 @@ public class RecallOrderController {
     @PostMapping("/list")
     @ApiOperation(value = "分页列表查询", notes = "条件分页查询列表", httpMethod = "POST")
     public ResObj<Paging<RecallOrderVO>> list(@RequestBody RecallOrderDTO paramRequest) {
+        paramRequest.setTenantId(null);
         return recallOrderApiService.list(paramRequest);
     }
 
+
+    @PostMapping("/tenant/list")
+    @ApiOperation(value = "租户分页列表查询", notes = "条件分页查询列表", httpMethod = "POST")
+    public ResObj<Paging<RecallOrderVO>> tenantList(@RequestBody RecallOrderDTO paramRequest) {
+        paramRequest.setTenantId(HeaderDataUtil.getTenantId());
+        return recallOrderApiService.list(paramRequest);
+    }
+
+
     /**
      * 信息
      */