From 2b64fd747005b44b685e616da71b63c92c536fe3 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期四, 27 八月 2026 22:26:53 +0800
Subject: [PATCH] fix: persist battery groups without templates
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java
index f9ce654..795f7b0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupServiceImpl.java
@@ -180,7 +180,11 @@
}
if (group.getTemplateId() == null)
{
- throw new ServiceException("模板不能为空");
+ if (group.getTemplateFieldRelations() != null && !group.getTemplateFieldRelations().isEmpty())
+ {
+ throw new ServiceException("未选择模板时不能配置模板字段");
+ }
+ return;
}
if (batteryGroupMapper.selectTemplate(group.getTemplateId()) == null)
{
@@ -231,6 +235,10 @@
batteries.add(item);
}
batteryGroupMapper.batchInsertBatteries(batteries);
+ if (group.getTemplateId() == null)
+ {
+ return;
+ }
List<TBatteryGroupRelationField> relations = group.getTemplateFieldRelations();
if (relations == null || relations.isEmpty())
{
--
Gitblit v1.7.1