From 94ec4e9e9214cb5dc28aef4a7f38be462cfda728 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 16:50:09 +0800
Subject: [PATCH] fix(product): 产品型号复制功能的进行勾选复制
---
src/main/java/com/ruoyi/basic/dto/ProductModelDto.java | 3 +++
src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java | 19 ++++++++++++++-----
2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
index 637d674..bdb38cd 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
@@ -12,4 +12,7 @@
//澶嶅埗鐨勭洰鏍囦骇鍝乮d
private Long targetProductId;
+
+ //鍨嬪彿list
+ private List<Long> modelListId;
}
diff --git a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
index 4a4ece9..64ef156 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/ProductModelServiceImpl.java
@@ -165,6 +165,7 @@
Long sourceProductId = productModelDto.getProductId();
Long targetProductId = productModelDto.getTargetProductId();
+ List<Long> modelListId = productModelDto.getModelListId();
if (sourceProductId.equals(targetProductId)) {
throw new ServiceException("婧愪骇鍝佸拰鐩爣浜у搧涓嶈兘鐩稿悓");
@@ -180,15 +181,23 @@
throw new ServiceException("鐩爣浜у搧涓嶅瓨鍦�");
}
- List<ProductModel> sourceModels = productModelMapper.selectList(
- new LambdaQueryWrapper<ProductModel>()
- .eq(ProductModel::getProductId, sourceProductId)
- .orderByAsc(ProductModel::getId)
- );
+ LambdaQueryWrapper<ProductModel> queryWrapper = new LambdaQueryWrapper<ProductModel>()
+ .eq(ProductModel::getProductId, sourceProductId)
+ .orderByAsc(ProductModel::getId);
+ Set<Long> selectedModelIds = null;
+ if (CollectionUtils.isNotEmpty(modelListId)) {
+ selectedModelIds = new LinkedHashSet<>(modelListId);
+ queryWrapper.in(ProductModel::getId, selectedModelIds);
+ }
+ List<ProductModel> sourceModels = productModelMapper.selectList(queryWrapper);
if (CollectionUtils.isEmpty(sourceModels)) {
throw new ServiceException("婧愪骇鍝佷笅娌℃湁鍙鍒剁殑鍨嬪彿");
}
+ if (selectedModelIds != null && sourceModels.size() != selectedModelIds.size()) {
+ throw new ServiceException("閮ㄥ垎鍨嬪彿涓嶅瓨鍦ㄦ垨涓嶅睘浜庢簮浜у搧");
+ }
+
List<ProductModel> copyList = new ArrayList<>();
for (ProductModel sourceModel : sourceModels) {
ProductModel copy = new ProductModel();
--
Gitblit v1.9.3