From 4c7296d45efe849dc70a3b2e2240c905481a91c9 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 29 九月 2025 17:44:46 +0800
Subject: [PATCH] 工控网涉密网联调
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineAcceptedFileService.java | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineAcceptedFileService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineAcceptedFileService.java
index 08ad5a8..373234e 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineAcceptedFileService.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/service/MachineAcceptedFileService.java
@@ -31,6 +31,7 @@
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Objects;
@@ -148,9 +149,12 @@
//鐜板満缂栫▼鐨勪换鍔￠泦鍚�
//List<MachineBackTask> onMachineTasks1 = machineBackTaskService.lambdaQuery().in(MachineBackTask::getId, backTaskIds).list();
+ if(backTaskIds.isEmpty()){
+ return Collections.emptyList();
+ }
List<MachineBackTask> onMachineTasks = machineBackTaskService.lambdaQuery()
.eq(MachineBackTask::getTaskType,MachineBackTask.TASK_TYPE_ON_MACHINE)
- .in(MachineBackTask::getId, backTaskIds).list();
+ .list();
List<Long> onMachineFileIds = new ArrayList<>();
for(MachineAcceptedFile accFile : acceptedFiles){
@@ -160,7 +164,14 @@
}
}
}
+ if(onMachineFileIds.isEmpty()){
+ return Collections.emptyList();
+ }
return machineFileService.lambdaQuery().in(MachineFile::getId,onMachineFileIds).list();
}
+
+ public List<MachineAcceptedFile> listByBackTaskId(Long backTaskId) {
+ return lambdaQuery().eq(MachineAcceptedFile::getBackTaskId,backTaskId).list();
+ }
}
--
Gitblit v1.9.3