From 5739e2493dddb671a11869a1c11ea57949319263 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 30 七月 2025 14:49:34 +0800
Subject: [PATCH] 设备台账表设备管理员字段调整（已去掉WK前缀），去掉消息推送逻辑中截取WK前缀的操作
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
index dee8a83..96c97ca 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java
@@ -138,7 +138,12 @@
queryWrapper.like("e.operation_system", eamEquipment.getOperationSystem());
}
if (StringUtils.isNotBlank(eamEquipment.getOrgId())) {
- queryWrapper.like("e.org_id", eamEquipment.getOrgId());
+ //杞﹂棿缂栫爜涓嶄负绌�
+ List<String> productIds = mdcProductionService.recursionChildren(eamEquipment.getOrgId());
+ if (CollectionUtil.isNotEmpty(productIds)) {
+ //涓嶅仛绛涢��
+ queryWrapper.in("e.org_id", productIds);
+ }
}
if (StringUtils.isNotBlank(eamEquipment.getEquipmentCategory())) {
queryWrapper.like("e.equipment_category", eamEquipment.getEquipmentCategory());
--
Gitblit v1.9.3