From 23091d21fb834e1dfc802262cc3861828d4b30b9 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Sun, 8 Jan 2023 11:21:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java  | 1 +
 .../resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml   | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java
index 930f69f..441202b 100644
--- a/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java
+++ b/api-admin/src/main/java/com/glxp/sale/admin/req/thrsys/FilterThrProductsRequest.java
@@ -28,4 +28,5 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private Long id;
     private String uuid;
     private Integer diType;
+    private String companyName;
 }
diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
index 9793385..3348083 100644
--- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
+++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
@@ -96,6 +96,7 @@
         p.zczbhhzbapzbh
         FROM thr_products_add_di tdi
         LEFT JOIN productinfo p ON tdi.uuid = p.uuid
+        LEFT JOIN company c on c.customerId=tdi.customerId
         <where>
             <if test="checkStatus != null">
                 AND tdi.status = #{checkStatus}
@@ -124,6 +125,9 @@
             <if test="diType != '' and diType != null">
                 AND p.diType = #{diType}
             </if>
+            <if test="companyName != '' and companyName != null">
+            AND c.companyName = #{companyName}
+        </if>
         </where>
         order by tdi.createTime DESC