From fa2ea8ba96fe9b52814fcd55f5cebf2b5ce43f9d Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 七月 2025 10:31:59 +0800
Subject: [PATCH] 用户管理添加eam中心

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
index bce9547..2f52af9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java
@@ -70,7 +70,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);
             } else {
                 return page;
             }
@@ -188,6 +188,7 @@
         entity.setHasOtherCheck(request.getHasOtherCheck());
         entity.setHasPrecisionCheck(request.getHasPrecisionCheck());
         entity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck());
+        entity.setRemark(request.getRemark());
         this.getBaseMapper().updateById(entity);
         //澶勭悊璇︽儏
         if(CollectionUtil.isNotEmpty(request.getTableDetailList())) {
@@ -252,6 +253,7 @@
         newEntity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck());
         //鍒犻櫎鏍囪
         newEntity.setDelFlag(CommonConstant.DEL_FLAG_0);
+        newEntity.setRemark(request.getRemark());
         //閲嶅鎬ф牎楠�
         EamTechnicalStatusEvaluationStandard exist = checkDuplicate(newEntity.getEquipmentId(), entity.getId());
         if(exist != null){

--
Gitblit v1.9.3