From 7ed87f3b9f98e383fc2e34b882090f2e0ffd3a75 Mon Sep 17 00:00:00 2001 From: cjw Date: Fri, 7 Jun 2024 15:51:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E9=A2=84=E5=88=97=E8=A1=A8=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysInterveneRecordServiceImpl.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) 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); }