From 3f61152272e9694f98bb5fdba755e4f7ceddbb31 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期一, 03 七月 2023 11:06:00 +0800
Subject: [PATCH] update
---
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..20edc75 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().isEmpty()) {
+ mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
+ }
return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo);
}
--
Gitblit v1.9.3