From 21cbdad6f59a045910b22bb3bf771e47d56c096f Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期五, 13 六月 2025 11:36:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java
index 4367c5d..075654f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java
@@ -39,13 +39,15 @@
public Result<?> selectOperatorList(@RequestParam(required = false, value = "equipmentId") String equipmentId,
@RequestParam("positionCode") String positionCode) {
String productionId = null;
+ String equipmentCode = null;
if (StringUtils.isNotBlank(equipmentId)) {
EamEquipment equipment = eamEquipmentService.getById(equipmentId);
if(equipment != null) {
productionId = equipment.getOrgId();
+ equipmentCode = equipment.getEquipmentCode();
}
}
- List<UserSelector> list = sysUserService.selectOperatorList(equipmentId, productionId, positionCode);
+ List<UserSelector> list = sysUserService.selectOperatorList(equipmentCode, productionId, positionCode);
return Result.ok(list);
}
}
--
Gitblit v1.9.3