Merge remote-tracking branch 'origin/dev' into dev

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;
-
     /**
      * 问题序号
      */

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<SysScaleVo> publishScaleVos = sysScaleMapper.findSysScaleByIds(StrUtil.join(StrUtil.COMMA, scaleIds));