From 2cc358709133b7103302ff91419978994caab3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Wed, 1 Apr 2026 18:04:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(model-config):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除重复的部件名称存在性检查代码 - 在更新操作中添加正确的重复名称验证 - 通过排除当前项目ID来避免自匹配验证错误 - 确保验证逻辑只在默认语言代码下执行 --- .../controller/admin/ModelConfigController.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/ModelConfigController.java b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/ModelConfigController.java index a028c921..6df66fd9 100644 --- a/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/ModelConfigController.java +++ b/nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/ModelConfigController.java @@ -231,12 +231,6 @@ public class ModelConfigController extends ControllerBase { itemLanguages.stream() .filter(i -> i.getConfigItemId().equals(it.getId())) .forEach(i -> { - VUtils.trueThrowBusinessError(modelConfigItemLanguageService.lambdaQuery() - .eq(QuotationModelConfigItemLanguage::getConfigId, languageItem.getConfigId()) - .eq(QuotationModelConfigItemLanguage::getLanguageId, languageItem.getLanguageId()) - .eq(QuotationModelConfigItemLanguage::getPartName, request.getPartName()) - .exists()) - .throwMessage("已存在该名称的部件或系统"); if (i.getId().equals(request.getId())) { i.setPartName(request.getPartName()); i.setPartRemark(request.getPartRemark()); @@ -253,6 +247,13 @@ public class ModelConfigController extends ControllerBase { it.setConfigId(config.getId()); if (StrUtil.equals(request.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE) && it.getId().equals(languageItem.getConfigItemId())) { + VUtils.trueThrowBusinessError(modelConfigItemLanguageService.lambdaQuery() + .eq(QuotationModelConfigItemLanguage::getConfigId, languageItem.getConfigId()) + .eq(QuotationModelConfigItemLanguage::getLanguageId, languageItem.getLanguageId()) + .eq(QuotationModelConfigItemLanguage::getPartName, request.getPartName()) + .ne(QuotationModelConfigItemLanguage::getId, languageItem.getId()) + .exists()) + .throwMessage("已存在该名称的部件或系统"); it.setType(request.getType()); it.setOptionalType(request.getOptionalType()); it.setParentId(request.getParentId());