From 8ef2ea1ef685b39c15d194fbd8f6d8046d353656 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 11:32:45 +0800
Subject: [PATCH] 修改word导入
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 4976c34..dfc744c 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
@@ -169,7 +169,7 @@
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
- queryWrapper.in("e.factory_code", factoryCode);
+ queryWrapper.in("e.factory_org_code", factoryCode);
}
}
//鏌ヨ鏉′欢杩囨护
@@ -257,7 +257,7 @@
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
- queryWrapper.in("e.factory_code", factoryCode);
+ queryWrapper.in("e.factory_org_code", factoryCode);
}
}
@@ -290,7 +290,7 @@
}
if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
queryWrapper.in("equipment_code", equipArr);
} else {
//娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
@@ -336,7 +336,7 @@
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
- queryWrapper.in("e.factory_code", factoryCode);
+ queryWrapper.in("e.factory_org_code", factoryCode);
}
}
--
Gitblit v1.9.3