From 04ef88cee361ec8730c400d96250a6c1cd9f9d80 Mon Sep 17 00:00:00 2001 From: “linengliang” <vanSuperEnergy@163.com> Date: 星期五, 08 九月 2023 16:23:47 +0800 Subject: [PATCH] 设备台账 1.ABC标识变更记录功能 2.质保日期变更记录功能 3.质保到期提醒 4.ABC标识与关键设备标识联动 5.设备质保期字段添加 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java index 750bb09..5b083fe 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java @@ -155,7 +155,15 @@ equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null); } } - repair.setMdcSectionIds(equipmentIds); + + if (repair.getMdcSectionIds() == null || repair.getMdcSectionIds().isEmpty()) { + repair.setMdcSectionIds(equipmentIds); + } + + if (repair.getMdcSectionIds() == null || repair.getMdcSectionIds().isEmpty()) { + return null; + } + return this.baseMapper.pageList(page, repair); } -- Gitblit v1.9.3