From 5e718c3b3383e8322802f50e6a10667cc89fd671 Mon Sep 17 00:00:00 2001 From: jiangzhe <244140623@qq.com> Date: Fri, 12 Apr 2024 10:16:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=A0=E5=AD=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/scale/domain/vo/SysScaleQuestionVo.java | 6 ------ .../scale/service/impl/SysScalePublishServiceImpl.java | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) 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));