diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleQuestionVo.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleQuestionVo.java index 29c6281..a143d18 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleQuestionVo.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/domain/vo/SysScaleQuestionVo.java @@ -37,12 +37,6 @@ public class SysScaleQuestionVo implements Serializable { @ExcelProperty(value = "所属测评量表id") private Long scaleId; - /** - * 测评量表标题 - */ - @ExcelProperty(value = "测评量表标题") - private String scaleTitle; - /** * 问题序号 */ diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java index f85ea15..d88a974 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysScalePublishServiceImpl.java @@ -173,6 +173,9 @@ public class SysScalePublishServiceImpl implements ISysScalePublishService { lqw.eq(SysScalePublish::getStatus, 0); sysScalePublishVo = baseMapper.selectVoOne(lqw); } + if (sysScalePublishVo == null) { + return new SysScalePublishVo(); + } Long batchNo = sysScalePublishVo.getBatchNo(); String scaleIds = sysScalePublishVo.getScaleIds(); List publishScaleVos = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, scaleIds));