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 AND tdi.status = #{checkStatus} @@ -124,6 +125,9 @@ AND p.diType = #{diType} + + AND c.companyName = #{companyName} + order by tdi.createTime DESC