From 31ecdb8c700529a59dd762f0c47f0ed9c66d5092 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 25 九月 2025 20:40:07 +0800
Subject: [PATCH] 工控网任务
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
index b9935e3..038a3cf 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/machinefile/controller/MachineCollectFileController.java
@@ -43,7 +43,7 @@
service.accept(ids);
return R.success();
}catch(Exception e) {
- log.error("鎺ュ彈鏂囦欢寮傚父",e);
+ log.error("鎺ュ彈閫変腑鏂囦欢寮傚父",e);
return R.fail(e.getMessage());
}
}
@@ -55,7 +55,7 @@
service.acceptAll();
return R.success();
}catch(Exception e) {
- log.error("鎺ュ彈鏂囦欢寮傚父",e);
+ log.error("鎺ュ彈鍏ㄩ儴鏂囦欢寮傚父",e);
return R.fail(e.getMessage());
}
}
@@ -81,14 +81,13 @@
@Operation(summary = "鏈哄簥鏂囦欢TEMP鐩綍鍒嗛〉鏌ヨ", description = "鍑荤┛鏂囦欢鍒嗛〉鏌ヨ锛屾煡璇㈢洰褰曚腑鐨勬枃浠讹紝杩樹笉绠楁椂鏈哄簥鍥炰紶鏂囦欢")
@GetMapping("/file-page-for-acceept")
public R<IPage<MachineFile>> filePageForAccept(MachineBackFileQueryVO query) {
- List<Long> deptIds = new ArrayList<>();
if("workshop".equals(query.getNodeType()) || "seg".equals(query.getNodeType())) {
//鑺傜偣涓鸿溅闂淬�佸伐娈�
MdmDept dept = mdmDeptService.getById(query.getNodeId());
String idStr = dept.getAncestors()+","+dept.getId();
List<MdmDept> depts = mdmDeptService.lambdaQuery().likeRight(MdmDept::getParentId, query.getNodeId()).list();
- deptIds.addAll(depts.stream().map(MdmDept::getId).toList());
+ List<Long> deptIds = new ArrayList<>(depts.stream().map(MdmDept::getId).toList());
deptIds.add(dept.getId());
//+鏈溅闂�
//Func.toStrList(",",idStr)
--
Gitblit v1.9.3