|
@@ -398,12 +398,12 @@ public class CreatePdfUtil {
|
|
//已曝光卷型
|
|
//已曝光卷型
|
|
String exposedPaperType = examTaskDetail.getExposedPaperType();
|
|
String exposedPaperType = examTaskDetail.getExposedPaperType();
|
|
if (drawRule == DrawRuleEnum.ONE) {
|
|
if (drawRule == DrawRuleEnum.ONE) {
|
|
- if (Objects.isNull(unexposedPaperType)) {
|
|
|
|
|
|
+ if (Objects.isNull(unexposedPaperType) || Objects.equals(unexposedPaperType.trim(), "")) {
|
|
CreatePdfCacheUtil.deletePaperType(key);
|
|
CreatePdfCacheUtil.deletePaperType(key);
|
|
throw ExceptionResultEnum.ERROR.exception("当前没有未曝光的卷型");
|
|
throw ExceptionResultEnum.ERROR.exception("当前没有未曝光的卷型");
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- if (Objects.isNull(exposedPaperType) && Objects.isNull(unexposedPaperType)) {
|
|
|
|
|
|
+ if ((Objects.isNull(exposedPaperType) || Objects.equals(exposedPaperType.trim(), "")) && (Objects.isNull(unexposedPaperType) || Objects.equals(unexposedPaperType.trim(), ""))) {
|
|
CreatePdfCacheUtil.deletePaperType(key);
|
|
CreatePdfCacheUtil.deletePaperType(key);
|
|
throw ExceptionResultEnum.ERROR.exception("当前没有未曝光的卷型");
|
|
throw ExceptionResultEnum.ERROR.exception("当前没有未曝光的卷型");
|
|
}
|
|
}
|