|
@@ -244,11 +244,16 @@ public class DownloadServiceImpl implements DownloadService {
|
|
Long cardId = paper.getCardId();
|
|
Long cardId = paper.getCardId();
|
|
Long attachmentId = paper.getAttachmentId();
|
|
Long attachmentId = paper.getAttachmentId();
|
|
BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
|
|
BasicAttachment basicAttachment = basicAttachmentService.getById(attachmentId);
|
|
|
|
+ String paperName = null;
|
|
|
|
+ String paperSuffix = null;
|
|
|
|
+ String paperPath = null;
|
|
|
|
+ if (Objects.nonNull(basicAttachment)){
|
|
|
|
+ paperName = basicAttachment.getName();
|
|
|
|
+ paperSuffix = basicAttachment.getType();
|
|
|
|
+ JSONObject jsonObject = JSONObject.parseObject(basicAttachment.getPath());
|
|
|
|
+ paperPath = (String) jsonObject.get(SystemConstant.PATH);
|
|
|
|
+ }
|
|
String paperType = paper.getName();
|
|
String paperType = paper.getName();
|
|
- String paperName = basicAttachment.getName();
|
|
|
|
- String paperSuffix = basicAttachment.getType();
|
|
|
|
- JSONObject jsonObject = JSONObject.parseObject(basicAttachment.getPath());
|
|
|
|
- String paperPath = (String) jsonObject.get(SystemConstant.PATH);
|
|
|
|
|
|
|
|
boolean exposureStatus;
|
|
boolean exposureStatus;
|
|
if (exposedPaperTypeList.contains(paperType)) {
|
|
if (exposedPaperTypeList.contains(paperType)) {
|