From 968fcd32cec1c3602da9ef2f40bd276ba0ee4050 Mon Sep 17 00:00:00 2001 From: wyb <1977763549@qq.com> Date: Thu, 4 Jan 2024 19:57:24 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E4=BD=9C=E5=BA=9F=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=92=8C=E6=96=87=E4=BB=B6=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SzyReportManagerServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/docus/server/reportmanager/service/impl/SzyReportManagerServiceImpl.java b/src/main/java/com/docus/server/reportmanager/service/impl/SzyReportManagerServiceImpl.java index 1174b76..0c3c43f 100644 --- a/src/main/java/com/docus/server/reportmanager/service/impl/SzyReportManagerServiceImpl.java +++ b/src/main/java/com/docus/server/reportmanager/service/impl/SzyReportManagerServiceImpl.java @@ -64,7 +64,7 @@ public class SzyReportManagerServiceImpl implements ReportManagerService { task.setSysflag(sysFlag); List tasks = collectTaskMapper.getTasks(task); if (Func.isEmpty(tasks)) { - throw new BaseException("无纸化系统没有可作废的电生理报告:" + reportNo); + throw new BaseException("无纸化系统没有可作废的电生理报告任务:" + reportNo); } ArrayList taskIds = new ArrayList<>(); ArrayList scanAssortIds = new ArrayList<>(); @@ -80,8 +80,12 @@ public class SzyReportManagerServiceImpl implements ReportManagerService { @Transactional(rollbackFor = Exception.class) public void cancelReportTaskAndFile(List taskIds, List scanAssortIds) { - collectTaskMapper.cancel(taskIds); - scanAssortMapper.cancel(scanAssortIds); + if (Func.isNotEmpty(taskIds)) { + collectTaskMapper.cancel(taskIds); + } + if (Func.isNotEmpty(scanAssortIds)) { + scanAssortMapper.cancel(scanAssortIds); + } } private String error(String msg) {