From 2027d9e8f84ee1e2bbaa8462be6275d7d95748b8 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 07 四月 2025 16:31:36 +0800
Subject: [PATCH] art: 设备管理-用户选择-根据岗位选择用户 问题修改
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java | 4 ++--
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 6 +++---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamUserSelectController.java | 4 +++-
3 files changed, 8 insertions(+), 6 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);
}
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
index 127d34d..4a23faa 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysUserService.java
@@ -324,10 +324,10 @@
/**
* 閫夋嫨鐢ㄦ埛
- * @param equipmentId 閫夋嫨鐨勮澶嘔D
+ * @param equipmentCode 閫夋嫨鐨勮澶嘔D
* @param productionId 閫夋嫨鐨勮溅闂碔D
* @param positionCode 宀椾綅缂栧彿
* @return
*/
- List<UserSelector> selectOperatorList(String equipmentId, String productionId, String positionCode);
+ List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode);
}
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
index 55e48fa..41a8703 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java
@@ -746,13 +746,13 @@
}
@Override
- public List<UserSelector> selectOperatorList(String equipmentId, String productionId, String positionCode) {
+ public List<UserSelector> selectOperatorList(String equipmentCode, String productionId, String positionCode) {
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUser::getPost, positionCode);
- if(StringUtils.isNotBlank(equipmentId)) {
+ if(StringUtils.isNotBlank(equipmentCode)) {
queryWrapper.isNull(SysUser::getEquipmentIds);
queryWrapper.or().eq(SysUser::getEquipmentIds, "");
- queryWrapper.or().like(SysUser::getEquipmentIds, equipmentId);
+ queryWrapper.or().like(SysUser::getEquipmentIds, equipmentCode);
}
if(StringUtils.isNotBlank(productionId)) {
queryWrapper.exists("select 1 from mdc_user_production t where t.user_id=id and t.pro_id={0}", productionId);
--
Gitblit v1.9.3