From 57945f688fd21076e36ab5332028c8b4a6dcf59c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 04 九月 2025 16:37:31 +0800
Subject: [PATCH] 同步密网设备管理代码
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 6121b18..86a24d7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -283,9 +283,11 @@
if (equipment == null) {
throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
}
- if (StringUtils.isBlank(equipment.getEquipmentManager())) {
- throw new JeecgBootException("璁惧鏈垎閰嶈澶囩鐞嗗憳锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
+ List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0002);
+ if (CollectionUtil.isEmpty(userSelectors)) {
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨宸ワ紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
}
+ List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
if (sysUser == null || !BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
@@ -311,8 +313,10 @@
}
variables.put("proofreading", true);
//骞惰浠诲姟浼氱
+ //鎿嶄綔宸ユ墽琛屼繚鍏�
variables.put("maintenance_execution", Collections.singletonList(sysUser.getUsername()));
- variables.put("precision_check", Collections.singletonList(equipment.getEquipmentManager()));
+ //缁翠慨宸ョ簿搴︽楠�
+ variables.put("precision_check", userApprovalList);
Result result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_process", variables);
if (result != null) {
//鏇存柊璁惧淇濆吇鐘舵��
@@ -370,7 +374,7 @@
//鎵ц瀹屾垚
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0006);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰鏈哄姩鍔烇紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
}
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
values.put("dataId", entity.getId());
@@ -418,7 +422,7 @@
case WAIT_CONFIRM:
userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getOrgId(), BusinessCodeConst.PCR0003);
if (CollectionUtil.isEmpty(userSelectors)) {
- throw new JeecgBootException("璁惧鏈垎閰嶇粰杞﹂棿鐝粍闀匡紝鏃犳硶杩涘叆涓嬬骇瀹℃壒锛�");
+ throw new JeecgBootException("璁惧鏈垎閰嶇粰缁翠慨涓讳换锛屾棤娉曡繘鍏ヤ笅绾у鎵癸紒");
}
//鐝粍闀跨‘璁�
userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList());
--
Gitblit v1.9.3