From f55271878d0599d7246b8c19a6501da13342d446 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期一, 08 四月 2024 08:21:16 +0800
Subject: [PATCH] 调整
---
system-run/src/main/resources/application-dev.yml | 2 +-
data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
index 29417ea..07c2a5a 100644
--- a/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
+++ b/data-server/src/main/java/com/yuanchu/mom/service/impl/DataReportingServiceImpl.java
@@ -129,7 +129,11 @@
for (FansSubmit fansSubmit : fansSubmits) {
sum += fansSubmit.getFansAdd();
}
- dataReporting2.setFansAdd(sum);
+ if (dataReporting.getFansAdd()!=null||dataReporting.getFansAdd()!=0){
+ dataReporting2.setFansAdd(dataReporting.getFansAdd());
+ }else{
+ dataReporting2.setFansAdd(sum);
+ }
return dataReportingMapper.updateById(dataReporting2);
}
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index 0b6562b..6857656 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
logging:
config: classpath:logback-spring.xml
# 鏃ュ織瀛樺偍璺緞+++++++++++++++++++++++++++杩愮淮闇�瑕侀厤缃�+++++++++++++++++++++++++++
- file-location: D:\楣撻洀鍏徃\frame-after\logs_IS_UNDEFINED
+ file-location:
# 鏁版嵁搴撳浠借矾寰�
backup:
--
Gitblit v1.9.3