From 5a5b01fa9824a42e3eb033088a20e24c32b30dda Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 17 八月 2024 16:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
index 4c80295..b19e461 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TIntegralRuleController.java
@@ -62,6 +62,9 @@
"11=开票说明")
public R<String> getInfo(Integer type) {
THtml g = htmlService.getOne(new QueryWrapper<THtml>().eq("type",type));
+ if (g == null){
+ return R.ok("");
+ }
return R.ok(g.getContent());
}
@GetMapping("/saveInfo")
@@ -87,10 +90,6 @@
THtml tHtml = new THtml();
tHtml.setType(type);
tHtml.setContent(info);
-
-
- tHtml.setCreateTime(LocalDateTime.now());
- tHtml.setDelFlag(false);
htmlService.save(tHtml);
}else{
g.setContent(info);
--
Gitblit v1.7.1