From 5a0dbf5c84f677c9f20252ccc63221dc7ba68d6c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 15 五月 2025 08:48:07 +0800
Subject: [PATCH] 修改项
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
index ee12d77..cae42ff 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java
@@ -111,6 +111,9 @@
@Transactional(rollbackFor = Exception.class)
public void saveMdcEquipment(MdcEquipment mdcEquipment, String selectedDeparts, String selectedProduction) {
//step.1 淇濆瓨璁惧
+ if (StringUtils.isBlank(mdcEquipment.getAttribute())) {
+ mdcEquipment.setAttribute("0");
+ }
this.save(mdcEquipment);
//step.2 淇濆瓨鎵�灞為儴闂�
if (oConvertUtils.isNotEmpty(selectedDeparts)) {
@@ -749,6 +752,9 @@
if (StringUtils.isNotEmpty(vo.getDeviceCategory())) {
queryWrapper.in(MdcEquipment::getDeviceCategory, Arrays.asList(vo.getDeviceCategory().split(",")));
}
+ if (StringUtils.isNotBlank(vo.getAttribute())) {
+ queryWrapper.eq(MdcEquipment::getAttribute, vo.getAttribute());
+ }
List<MdcEquipment> list = super.list(queryWrapper);
// List<MdcEquipment> list = super.list(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentType, equipmentType).in(MdcEquipment::getEquipmentId, equipmentIdList));
return list.stream().map(MdcEquipment::getEquipmentId).collect(Collectors.toList());
--
Gitblit v1.9.3