From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante

---
 service-fee/src/main/java/com/java110/fee/cmd/oweFeeCallable/WriteOweFeeCallableCmd.java |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/service-fee/src/main/java/com/java110/fee/cmd/oweFeeCallable/WriteOweFeeCallableCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/oweFeeCallable/WriteOweFeeCallableCmd.java
index 8882dbc..2403311 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/oweFeeCallable/WriteOweFeeCallableCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/oweFeeCallable/WriteOweFeeCallableCmd.java
@@ -16,6 +16,7 @@
 import com.java110.po.oweFeeCallable.OweFeeCallablePo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.text.ParseException;
@@ -77,8 +78,19 @@
         ReportOweFeeDto reportOweFeeDto = new ReportOweFeeDto();
         reportOweFeeDto.setFeeId(feeId);
         reportOweFeeDto.setCommunityId(reqJson.getString("communityId"));
-        List<ReportOweFeeDto> reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportOweFees(reportOweFeeDto);
+        List<ReportOweFeeDto> reportOweFeeDtos = reportOweFeeInnerServiceSMOImpl.queryReportAllOweFees(reportOweFeeDto);
         Assert.listOnlyOne(reportOweFeeDtos, "娆犺垂涓嶅瓨鍦�");
+
+        String ownerId = reportOweFeeDtos.get(0).getOwnerId();
+        String ownerName = reportOweFeeDtos.get(0).getOwnerName();
+
+        if(StringUtil.isEmpty(ownerId)){
+            ownerId = "-1";
+        }
+
+        if(StringUtil.isEmpty(ownerName)){
+            ownerName = "鏃犱笟涓�";
+        }
 
         //todo
         OweFeeCallablePo oweFeeCallablePo = new OweFeeCallablePo();
@@ -90,8 +102,8 @@
         oweFeeCallablePo.setFeeName(reportOweFeeDtos.get(0).getFeeName());
         oweFeeCallablePo.setCommunityId(reqJson.getString("communityId"));
         oweFeeCallablePo.setConfigId(reportOweFeeDtos.get(0).getConfigId());
-        oweFeeCallablePo.setOwnerId(reportOweFeeDtos.get(0).getOwnerId());
-        oweFeeCallablePo.setOwnerName(reportOweFeeDtos.get(0).getOwnerName());
+        oweFeeCallablePo.setOwnerId(ownerId);
+        oweFeeCallablePo.setOwnerName(ownerName);
         oweFeeCallablePo.setPayerObjId(reportOweFeeDtos.get(0).getPayerObjId());
         oweFeeCallablePo.setPayerObjName(reportOweFeeDtos.get(0).getPayerObjName());
         oweFeeCallablePo.setPayerObjType(reportOweFeeDtos.get(0).getPayerObjType());

--
Gitblit v1.8.0