From 13d561bea26641b6aa66bd636a821f2b7ff5f5ff Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 18 Sep 2023 16:30:48 +0800
Subject: [PATCH 1/2] =?UTF-8?q?add=20-=20=E6=9F=A5=E8=AF=A2=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=20ID=20=E9=9B=86?=
 =?UTF-8?q?=E5=90=88=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tyr/client/model/product/ProductSearchListReq.java     | 7 ++++++-
 .../axzo/tyr/server/service/impl/ProductServiceImpl.java   | 2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchListReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchListReq.java
index f36b8f04..28e609cc 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchListReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductSearchListReq.java
@@ -7,6 +7,8 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * 产品分页搜索
  *
@@ -16,7 +18,10 @@ import lombok.experimental.Accessors;
 @Data
 @Accessors(chain = true)
 public class ProductSearchListReq{
-
+    /**
+     * 产品 ID 集合
+     */
+    private List<Long> ids;
     /**
      * 产品名称
      */
diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
index 4b6dd4c9..1cefaa0c 100644
--- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
+++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductServiceImpl.java
@@ -17,6 +17,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 import java.util.List;
@@ -38,6 +39,7 @@ public class ProductServiceImpl implements ProductService {
     @Override
     public ApiResult<List<ProductVO>> list(ProductSearchListReq req) {
         List<ProductModule> list = productModuleDao.lambdaQuery()
+                .in(!CollectionUtils.isEmpty(req.getIds()), ProductModule::getId, req.getIds())
                 .like(StringUtils.hasLength(req.getName()), ProductModule::getProductName, req.getName())
                 .eq(Objects.nonNull(req.getDictWorkspaceTypeId()), ProductModule::getDictWorkspaceTypeId, req.getDictWorkspaceTypeId())
                 .eq(Objects.nonNull(req.getStatus()), ProductModule::getStatus, req.getStatus())

From 55c67f3fcb6a92daadd78ce80a2721bbd5b18332 Mon Sep 17 00:00:00 2001
From: TanJ <tanjie@axzo.cn>
Date: Mon, 18 Sep 2023 16:49:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=89=88=E6=9C=AC=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml            | 3 ++-
 tyr-api/pom.xml    | 2 +-
 tyr-server/pom.xml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4bead31e..39612245 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <groupId>cn.axzo.tyr</groupId>
     <artifactId>tyr</artifactId>
     <packaging>pom</packaging>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>${revision}</version>
     <name>tyr</name>
 
     <modules>
@@ -20,6 +20,7 @@
     </modules>
 
     <properties>
+        <revision>2.0.0-SNAPSHOT</revision>
         <axzo-bom.version>2.0.0-SNAPSHOT</axzo-bom.version>
         <axzo-dependencies.version>2.0.0-SNAPSHOT</axzo-dependencies.version>
         <lombok.version>1.18.22</lombok.version>
diff --git a/tyr-api/pom.xml b/tyr-api/pom.xml
index 118ad5eb..08786447 100644
--- a/tyr-api/pom.xml
+++ b/tyr-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tyr</artifactId>
         <groupId>cn.axzo.tyr</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
diff --git a/tyr-server/pom.xml b/tyr-server/pom.xml
index b75af331..20ab0ca7 100644
--- a/tyr-server/pom.xml
+++ b/tyr-server/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>tyr</artifactId>
         <groupId>cn.axzo.tyr</groupId>
-        <version>1.0.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>