Merge branch 'master' of http://47.109.37.87:3000/by2025/SmartParks

ruoyi-modules/Sis/src/main/java/org/dromara/sis/domain/vo/SisAlarmEventProcessVo.java

@@ -51,7 +51,7 @@ public class SisAlarmEventProcessVo implements Serializable {
     private String solveName;
 
     /**
-     * 工单问题回复内容
+     * 问题回复内容
      */
     @ExcelProperty(value = "工单问题回复内容")
     private String workReply;

ruoyi-modules/Sis/src/main/java/org/dromara/sis/service/impl/SisAlarmEventProcessServiceImpl.java

@@ -148,7 +148,7 @@ public class SisAlarmEventProcessServiceImpl implements ISisAlarmEventProcessSer
         LambdaQueryWrapper<SisAlarmEventProcess> lqw = Wrappers.lambdaQuery();
         lqw.eq(SisAlarmEventProcess::getAlarmId, alarmId);
         lqw.eq(SisAlarmEventProcess::getState, 40);
-        SisAlarmEventProcessVo sisAlarmEventProcessVo = baseMapper.selectVoById(alarmId);
+        SisAlarmEventProcessVo sisAlarmEventProcessVo = baseMapper.selectVoOne(lqw);
         if (sisAlarmEventProcessVo == null) {
             return null;
         }