From a3cfd941f3ccb05906ecbe99e6993f96770b51ed Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 10 七月 2025 10:43:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
index b444d9d..8834661 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.StrUtils;
import org.jeecg.modules.mdc.entity.Equipment;
import org.jeecg.modules.mdc.service.IEquipmentService;
import org.jeecg.modules.mdc.util.DateUtils;
@@ -75,6 +76,9 @@
}
String day = DateUtils.format(DateUtils.plusTime(DateUtils.getNow(), -dayNum), DateUtils.STR_DATE_TIME_SMALL);
for (Equipment equipment : list) {
+ if (StrUtils.isNotBlankOrNull(equipment.getEquipmentid()) && equipment.getEquipmentid().contains("-")) {
+ continue;
+ }
if (StringUtils.isNotBlank(equipment.getSavetablename())) {
String tableName = equipmentService.checkTableExists(equipment.getSavetablename());
if (StringUtils.isNotBlank(tableName)) {
--
Gitblit v1.9.3