BUGFIX:PartialDesign传空时,先从数据库获取原数据
This commit is contained in:
@@ -968,10 +968,20 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
|||||||
} else if (Objects.isNull(item.getPartialDesign())
|
} else if (Objects.isNull(item.getPartialDesign())
|
||||||
|| StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignMinioPath())) {
|
|| StringUtil.isNullOrEmpty(item.getPartialDesign().getPartialDesignMinioPath())) {
|
||||||
if (designType.equals("merge")) {
|
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));
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user