From 8f84f110e635237eace24f0077e9ab8f6b53d480 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期日, 26 四月 2020 17:33:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
index 3de6dac..2e6ecd1 100644
--- a/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
+++ b/fanli/src/main/java/com/yeshi/fanli/service/impl/config/ConfigServiceImpl.java
@@ -31,6 +31,7 @@
@Resource
private ConfigMapper configMapper;
+
@Cacheable(value = "config")
public List<Config> getAllList() {
@@ -52,6 +53,9 @@
@Transactional
public void update(List<Config> list) {
for (Config config : list) {
+ if (config.getValue() == null) {
+ config.setValue("");
+ }
config.setCreatetime(new Date().getTime() + "");
configMapper.updateByPrimaryKeySelective(config);
}
@@ -59,6 +63,9 @@
@CacheEvict(value = "config", allEntries = true)
public void update(Config config) {
+ if (config.getValue() == null)
+ config.setValue("");
+
config.setCreatetime(new Date().getTime() + "");
configMapper.updateByPrimaryKeySelective(config);
}
--
Gitblit v1.8.0