aidlab/aida_back
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev/dev_xp' into dev/3.1_release_merge

Browse Source
This commit is contained in:
xupei
2026-01-16 17:17:25 +08:00
parent 5bae785a9f 4c43b98c02
commit 6bc500e78f
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/ai/da/service/impl/DesignItemServiceImpl.java
View File

@@ -974,8 +974,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
log.error("未知designItemDetailId: {}", item.getId()); log.error("未知designItemDetailId: {}", item.getId());
throw new BusinessException("designItemDetails.not.found"); throw new BusinessException("designItemDetails.not.found");
} else if (StringUtil.isNullOrEmpty(designItemDetail.getPartialDesign())) { } else if (StringUtil.isNullOrEmpty(designItemDetail.getPartialDesign())) {
log.error("merge模式下，必须提供partialDesign"); item.setPartialDesign(new PartialDesignDTO(designItemDetail.getUndividedLayer()));
throw new BusinessException("required.partialDesign"); /*log.error("merge模式下，必须提供partialDesign");
throw new BusinessException("required.partialDesign");*/
} else { } else {
item.setPartialDesign(new PartialDesignDTO(designItemDetail.getPartialDesign())); item.setPartialDesign(new PartialDesignDTO(designItemDetail.getPartialDesign()));
} }