rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/quotation' into test

This commit is contained in:
曹鹏飞 2026-04-01 18:06:34 +08:00
parent 4eeec33801 2cc3587091
commit 81cca6f475
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nflg-mobilebroken-quotation/src/main/java/com/nflg/mobilebroken/quotation/controller/admin/ModelConfigController.java
View File

@ -231,12 +231,6 @@ public class ModelConfigController extends ControllerBase {
itemLanguages.stream() itemLanguages.stream()
.filter(i -> i.getConfigItemId().equals(it.getId())) .filter(i -> i.getConfigItemId().equals(it.getId()))
.forEach(i -> { .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())) { if (i.getId().equals(request.getId())) {
i.setPartName(request.getPartName()); i.setPartName(request.getPartName());
i.setPartRemark(request.getPartRemark()); i.setPartRemark(request.getPartRemark());
@ -253,6 +247,13 @@ public class ModelConfigController extends ControllerBase {
it.setConfigId(config.getId()); it.setConfigId(config.getId());
if (StrUtil.equals(request.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE) if (StrUtil.equals(request.getLanguageCode(), Constant.DEFAULT_LANGUAGE_CODE)
&& it.getId().equals(languageItem.getConfigItemId())) { && 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.setType(request.getType());
it.setOptionalType(request.getOptionalType()); it.setOptionalType(request.getOptionalType());
it.setParentId(request.getParentId()); it.setParentId(request.getParentId());