From 161402178c31b19aaa2de204d94c085e1b6da9c9 Mon Sep 17 00:00:00 2001 From: hyingbo <1363390067@qq.com> Date: 星期二, 01 七月 2025 16:40:32 +0800 Subject: [PATCH] 安灯发送消息添加类型字段 --- 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 b508ae8..c2ec226 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