From ee530992793ed7d0b7f16f1ce07b6c53ae265068 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 22 七月 2025 13:56:40 +0800 Subject: [PATCH] art: 技术状态变更申请-字典转译 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/service/impl/EamEquipmentServiceImpl.java | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 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 c994336..5dbd7b1 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 @@ -235,7 +235,7 @@ } @Override - public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id) { + public List<EquipmentSearchResult> asyncLoadEquipment(String keyword, Integer pageSize, String id, String factoryOrgCode) { if (StringUtils.isNotBlank(id)) { EamEquipment eamEquipment = eamEquipmentMapper.selectById(id); if (eamEquipment != 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(); @@ -269,10 +269,13 @@ } if (StringUtils.isNotBlank(keyword)) { - queryWrapper.like("equipment_code", keyword); - queryWrapper.or().like("equipment_name", keyword); + queryWrapper.like("e.equipment_code", keyword); + queryWrapper.or().like("e.equipment_name", keyword); } - queryWrapper.eq("del_flag", CommonConstant.DEL_FLAG_0); + if(StringUtils.isNotBlank(factoryOrgCode)){ + queryWrapper.likeRight("e.factory_org_code", factoryOrgCode); + } + queryWrapper.eq("e.del_flag", CommonConstant.DEL_FLAG_0); IPage<EamEquipment> pageResult = eamEquipmentMapper.queryPageList(page, queryWrapper); if (pageResult != null && CollectionUtil.isNotEmpty(pageResult.getRecords())) { List<EquipmentSearchResult> resultList = new ArrayList<>(); -- Gitblit v1.9.3