From 17b2bc9d7509afdc34cbbacbb351f447b635acc9 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Mon, 18 Sep 2023 10:19:18 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=B7=BB=E5=8A=A0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E9=87=8D=E5=90=8D=E7=9B=B8=E5=85=B3=E7=9A=84=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/axzo/tyr/client/model/product/ProductUpdateReq.java | 2 +-
 .../axzo/tyr/server/service/impl/ProductServiceImpl.java   | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductUpdateReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductUpdateReq.java
index 774f265e..0e09042e 100644
--- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductUpdateReq.java
+++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/product/ProductUpdateReq.java
@@ -23,7 +23,7 @@ public class ProductUpdateReq {
      * 产品 ID
      */
     @NotNull(message = "产品 ID 不能为空")
-    private String id;
+    private Long id;
 
     /**
      * 产品名称
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 b1de1237..4b6dd4c9 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
@@ -76,9 +76,12 @@ public class ProductServiceImpl implements ProductService {
 
     @Override
     public ApiResult<ProductVO> update(ProductUpdateReq req) {
+        Optional<ProductModule> optProduct = productModuleDao.lambdaQuery()
+                .eq(ProductModule::getProductName, req.getProductName())
+                .eq(ProductModule::getDictWorkspaceTypeId, req.getDictWorkspaceTypeId())
+                .oneOpt();
+        AssertUtil.isTrue(!optProduct.isPresent() || Objects.equals(req.getId(), optProduct.get().getId()), "产品名称在相同工作台类型下不允许重复");
         ProductModule productModule = productModuleDao.getById(req.getId());
-        AssertUtil.isTrue(Objects.equals(req.getProductName(), productModule.getProductName())
-                && Objects.equals(req.getDictWorkspaceTypeId(), productModule.getDictWorkspaceTypeId()), "产品名称在相同工作台类型下不允许重复");
         BeanMapper.copyBeanIgnoreNull(req, () -> productModule);
         productModuleDao.updateById(productModule);
         return ApiResult.ok(BeanMapper.copyBeanIgnoreNull(productModule, ProductVO.class));