From 1a438691fdad75bf7b26202cee792c1b8f8c208e Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期五, 23 十月 2026 18:09:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
index fcf020a..2e25c0b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/StandardTemplateServiceImpl.java
@@ -63,9 +63,6 @@
@Override
public int upStandardTemplate(StandardTemplate standardTemplate) {
- if (standardTemplate.getPrice() == null) {
- standardTemplate.setPrice(java.math.BigDecimal.ZERO);
- }
if (StringUtils.isNotBlank(standardTemplate.getThing())) {
standardTemplate.setThing(GZipUtil.compress(standardTemplate.getThing()));
} else {
@@ -134,6 +131,9 @@
// 鏌ヨ鏃фā鏉�
StandardTemplate standardTemplate = baseMapper.selectById(newTemplate.getId());
newTemplate.setThing(standardTemplate.getThing());
+ if (newTemplate.getStandardRequirement() == null) {
+ newTemplate.setStandardRequirement(standardTemplate.getStandardRequirement());
+ }
if (newTemplate.getPrice() == null) {
newTemplate.setPrice(java.math.BigDecimal.ZERO);
}
--
Gitblit v1.9.3