From f6fae08f23d102a58f9b2000a07ca5dc8f379c14 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期六, 29 八月 2026 10:38:58 +0800
Subject: [PATCH] 修复另存模板更新时间为空
---
ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImplTest.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImpl.java | 4 ++++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImplTest.java b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImplTest.java
index b141a62..66cec8f 100644
--- a/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImplTest.java
+++ b/ruoyi-admin/src/test/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImplTest.java
@@ -37,6 +37,7 @@
void insertShouldValidateFieldsAndReplaceRelations()
{
TBatteryGroupTemplate template = template(null, " 默认模板 ", Arrays.asList(1L, 2L));
+ template.setUpdateBy(null);
when(batteryGroupTemplateMapper.selectEnabledFieldsByIds(template.getFieldIds()))
.thenReturn(Arrays.asList(field(1L), field(2L)));
doAnswer(invocation -> {
@@ -52,6 +53,7 @@
assertEquals(0, captor.getValue().get(0).getSortOrder());
assertEquals(1, captor.getValue().get(1).getSortOrder());
assertEquals("默认模板", template.getTemplateName());
+ assertEquals("admin", template.getUpdateBy());
}
@Test
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImpl.java
index 19a199e..9586a37 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBatteryGroupTemplateServiceImpl.java
@@ -57,6 +57,10 @@
{
validateTemplate(template, false);
template.setTemplateName(trimToNull(template.getTemplateName()));
+ if (StringUtils.isEmpty(template.getUpdateBy()))
+ {
+ template.setUpdateBy(template.getCreateBy());
+ }
template.setCreateTime(new Date());
int rows = batteryGroupTemplateMapper.insertBatteryGroupTemplate(template);
replaceFields(template);
--
Gitblit v1.7.1