From e78e79a565184e0d89124abbcb5bf3200c2cb8f6 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期一, 04 九月 2023 14:19:43 +0800
Subject: [PATCH] 增加数据库厂商标识 ，支持在SQL中设置不同数据databaseId,进行多数据库支持。（主要用于应对不同数据库间的函数差异）
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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 a99d97b..afb0a78 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
@@ -50,17 +50,17 @@
List<String> equipmentIds = new ArrayList<>();
if (StringUtils.isNotEmpty(mdcDeviceCalendarQueryVo.getParentId()) && StringUtils.isEmpty(mdcDeviceCalendarQueryVo.getEquipmentId())) {
if ("2".equals(mdcDeviceCalendarQueryVo.getTypeTree())) {
- //閮ㄩ棬灞傜骇
+ // 閮ㄩ棬灞傜骇
equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, mdcDeviceCalendarQueryVo.getParentId());
} else {
- //浜х嚎灞傜骇
+ // 浜х嚎灞傜骇
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcDeviceCalendarQueryVo.getParentId());
}
} else if (StringUtils.isNotEmpty(mdcDeviceCalendarQueryVo.getEquipmentId())) {
- //鍗曞彴璁惧淇℃伅
+ // 鍗曞彴璁惧淇℃伅
mdcDeviceCalendarQueryVo.setEquipmentIdList(Collections.singletonList(mdcDeviceCalendarQueryVo.getEquipmentId()));
} else {
- //鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
+ // 鏌ヨ鐢ㄦ埛鎷ユ湁鐨勬墍鏈夎澶囦俊鎭�
if ("2".equals(mdcDeviceCalendarQueryVo.getTypeTree())) {
//閮ㄩ棬灞傜骇
equipmentIds = mdcEquipmentService.getEquipmentIdsByDepart(userId, null);
@@ -73,6 +73,10 @@
mdcDeviceCalendarQueryVo.setEquipmentIdList(equipmentIds);
}
+ if (mdcDeviceCalendarQueryVo.getEquipmentIdList() == null || mdcDeviceCalendarQueryVo.getEquipmentIdList().isEmpty()) {
+ return null;
+ }
+
return this.baseMapper.pageList(pageData, mdcDeviceCalendarQueryVo);
}
--
Gitblit v1.9.3