From 3b1be358f4d8709d53901d9e16d4d1552b2d0b4f Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 17 七月 2021 23:07:46 +0800
Subject: [PATCH] 合并远程分支，并处理冲突
---
service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java b/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java
index f00c83a..289d3bb 100644
--- a/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java
+++ b/service-report/src/main/java/com/java110/report/bmo/reportOweFee/impl/GetReportOweFeeBMOImpl.java
@@ -208,7 +208,7 @@
oldAmount = oldAmount.add(new BigDecimal(Double.parseDouble(reportOweFeeDto.getAmountOwed()))).setScale(2, BigDecimal.ROUND_HALF_EVEN);
reportOweFeeItemDto.setAmountOwed(oldAmount.doubleValue() + "");
}
- if (!StringUtil.isEmpty(reportOweFeeDto.getOwnerName())) {
+ if(!StringUtil.isEmpty(reportOweFeeDto.getOwnerName()) && StringUtil.isEmpty(oldReportOweFeeDto.getOwnerName())) {
oldReportOweFeeDto.setOwnerName(reportOweFeeDto.getOwnerName());
}
oldReportOweFeeDto.setUpdateTime(reportOweFeeDto.getUpdateTime());
--
Gitblit v1.8.0