From c82b14f3a882698cbca62ef168615d31711320ca Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 15:12:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 8cf5866..14dfe0a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -392,17 +392,17 @@
Map<String, Object> values = new HashMap<>();
if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && user.getUsername().equals(order.getOperator())) {
// 鐐规浜虹偣妫�缁撴潫
- String manager = Optional.ofNullable(iEamEquipmentService.getById(order.getEquipmentId()))
- .map(EamEquipment::getEquipmentManager)
- .orElse(null);
- if (manager == null) {
- throw new IllegalArgumentException("璁惧绠＄悊鍛樻湭閰嶇疆");
- }
- List<String> usernameList = Collections.singletonList(manager);
+// String manager = Optional.ofNullable(iEamEquipmentService.getById(order.getEquipmentId()))
+// .map(EamEquipment::getEquipmentManager)
+// .orElse(null);
+// if (manager == null) {
+// throw new IllegalArgumentException("璁惧绠＄悊鍛樻湭閰嶇疆");
+// }
+// List<String> usernameList = Collections.singletonList(manager);
values.put("dataId", order.getId());
values.put("organization", "鐐规浜虹偣妫�缁撴潫");
values.put("comment", "鐐规浜虹偣妫�缁撴潫");
- values.put("NextAssignee", usernameList);
+// values.put("NextAssignee", usernameList);
request.setComment("鐐规浜虹偣妫�缁撴潫");
} else {
// 鐝粍闀跨‘璁�
--
Gitblit v1.9.3