From 86ba6f759117d9437bcaab902efa29e8cf72c815 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 25 七月 2025 17:51:36 +0800
Subject: [PATCH] 设备故障登记
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 8ce714f..a5ad134 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
@@ -62,7 +62,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
- @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.ACCEPTANCE, businessTable = "eam_equipment")
+// @EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.ACCEPTANCE, businessTable = "eam_equipment")
public EamEquipment saveEquipment(EamEquipment eamEquipment) {
if (eamEquipment == null) {
return null;
@@ -261,7 +261,7 @@
list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
if(!CollectionUtils.isEmpty(baseFactoryUserList)){
Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
- Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ Set<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
queryWrapper.in("e.factory_org_code", factoryCode);
} else {
return Collections.emptyList();
@@ -273,7 +273,7 @@
queryWrapper.or().like("e.equipment_name", keyword);
}
if(StringUtils.isNotBlank(factoryOrgCode)){
- queryWrapper.eq("e.factory_org_code", factoryOrgCode);
+ queryWrapper.likeRight("e.factory_org_code", factoryOrgCode);
}
queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0);
IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper);
--
Gitblit v1.9.3