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 16:24:38 +08:00
parent 4ef209cfd4 0047be7a03
commit c93ad6daa9
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -968,10 +968,20 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
} else if (Objects.isNull(item.getPartialDesign())
|| StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignMinioPath())) {
if (designType.equals("merge")) {
log.error("merge模式下，必须提供partialDesign");
throw new BusinessException("required.partialDesign");
// 先去数据库进行查找，如果数据库中也是空，则提示需要提供，否则无法生成
DesignItemDetail designItemDetail = designItemDetailService.getById(item.getId());
if (Objects.isNull(designItemDetail)){
log.error("未知designItemDetailId: {}", item.getId());
throw new BusinessException("designItemDetails.not.found");
} else if (StringUtil.isNullOrEmpty(designItemDetail.getPartialDesign())) {
log.error("merge模式下，必须提供partialDesign");
throw new BusinessException("required.partialDesign");
} else {
item.setPartialDesign(new PartialDesignDTO(designItemDetail.getPartialDesign()));
}
} else {
item.setPartialDesign(new PartialDesignDTO(null));
}
item.setPartialDesign(new PartialDesignDTO(null));
}
});
}