From e5a8de3b7ced0300bf7b7e5a3bc5b615fb4e53f2 Mon Sep 17 00:00:00 2001
From: yangman <15045099937@qq.com>
Date: 星期一, 03 七月 2023 13:36:31 +0800
Subject: [PATCH] 修改扭矩配置管理
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
index fca4f01..a99d97b 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
@@ -69,7 +69,9 @@
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
}
}
- mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
+ if (mdcDeviceCalendarQueryVo.getEquipmentIdList() == null || mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) {
+ mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
+ }
return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo);
}
--
Gitblit v1.9.3