diff --git a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java index bea7885..ec865df 100644 --- a/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java +++ b/ruoyi-modules/rouyi-scale/src/main/java/org/dromara/scale/service/impl/SysInterveneRecordServiceImpl.java @@ -1,5 +1,6 @@ package org.dromara.scale.service.impl; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -60,14 +61,16 @@ public class SysInterveneRecordServiceImpl implements ISysInterveneRecordService .eq(SysInterveneRecord::getUserId, userId) .orderByDesc(SysInterveneRecord::getCreateTime) ); - for (SysInterveneRecordVo record : result.getRecords()) { - SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo()); - record.setSessionName(sysScalePublish.getSessionName()); - SysWarnRecord warn = warnMapper.selectOne(new LambdaQueryWrapper() - .select(SysWarnRecord::getNote) - .eq(SysWarnRecord::getBatchNo, record.getBatchNo()) - .eq(SysWarnRecord::getUserId, record.getUserId())); - record.setNote(warn.getNote()); + if (ObjectUtil.isNotEmpty(result.getRecords())) { + for (SysInterveneRecordVo record : result.getRecords()) { + SysScalePublish sysScalePublish = publishMapper.selectById(record.getBatchNo()); + record.setSessionName(sysScalePublish.getSessionName()); + SysWarnRecord warn = warnMapper.selectOne(new LambdaQueryWrapper() + .select(SysWarnRecord::getNote) + .eq(SysWarnRecord::getBatchNo, record.getBatchNo()) + .eq(SysWarnRecord::getUserId, record.getUserId())); + record.setNote(warn.getNote()); + } } return TableDataInfo.build(result); }