Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -422,9 +422,9 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
||||
throw new BusinessException("sysFile.not.found");
|
||||
}
|
||||
modelUrl = sysFile.getUrl();
|
||||
high = 1050;
|
||||
width = 500;
|
||||
} else {
|
||||
high = 700;
|
||||
width = 320;
|
||||
} else if (design.getModelType().equals(ModelType.LIBRARY.getValue())){
|
||||
Library libFile = libraryService.getById(design.getTemplateId());
|
||||
if (Objects.isNull(libFile)) {
|
||||
throw new BusinessException("sysFile.not.found");
|
||||
@@ -432,6 +432,8 @@ public class DesignItemServiceImpl extends ServiceImpl<DesignItemMapper, DesignI
|
||||
modelUrl = libFile.getUrl();
|
||||
high = libFile.getHigh();
|
||||
width = libFile.getWidth();
|
||||
}else {
|
||||
throw new BusinessException("unknown.modelType");
|
||||
}
|
||||
LibraryModelPoint modelPoint = libraryModelPointService.getByRelationId(design.getTemplateId(), design.getModelType());
|
||||
if (Objects.isNull(modelPoint)) {
|
||||
|
||||
Reference in New Issue
Block a user