From c4eddf6f793986516c919add6493ad2be2c63b82 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 08 四月 2025 13:57:47 +0800
Subject: [PATCH] 修改flow基础代码,添加设备岗位查询用户
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysUserServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
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..d2d6455 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,16 +746,14 @@
}
@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)) {
- queryWrapper.isNull(SysUser::getEquipmentIds);
- queryWrapper.or().eq(SysUser::getEquipmentIds, "");
- queryWrapper.or().like(SysUser::getEquipmentIds, equipmentId);
+ if(StringUtils.isNotBlank(equipmentCode)) {
+ queryWrapper.and(q -> q.isNull(SysUser::getEquipmentIds).or().eq(SysUser::getEquipmentIds, "").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);
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id=sys_user.id and t.pro_id={0}", productionId);
}
queryWrapper.eq(SysUser::getDelFlag, CommonConstant.DEL_FLAG_0);
queryWrapper.eq(SysUser::getStatus, CommonConstant.DEL_FLAG_1);
--
Gitblit v1.9.3