From 187da073887b5345779225d4df08055c0d3487e6 Mon Sep 17 00:00:00 2001
From: weijiguang <weijiguang@sskuaixiu.com>
Date: Mon, 9 Nov 2020 10:54:03 +0800
Subject: [PATCH] init
---
src/main/java/com/jair/service/impl/PlanningServiceImpl.java | 3 +++
src/main/resources/mapper/ContractMapper.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/main/java/com/jair/service/impl/PlanningServiceImpl.java b/src/main/java/com/jair/service/impl/PlanningServiceImpl.java
index 1fa40fa..5eb6a7b 100644
--- a/src/main/java/com/jair/service/impl/PlanningServiceImpl.java
+++ b/src/main/java/com/jair/service/impl/PlanningServiceImpl.java
@@ -90,6 +90,9 @@ public class PlanningServiceImpl extends ServiceImpl<FeePlanningMapper, FeePlann
for (CfgFeePo fee : fees) {
Date planningDate = contract.getStartDate();
Integer paidAmount = fee.getFirstPaidAmount();
+ if (paidAmount == null) {
+ paidAmount = 0;
+ }
while (true) {
FeePlanning planning = new FeePlanning();
planning.setType(2); // 费用项
diff --git a/src/main/resources/mapper/ContractMapper.xml b/src/main/resources/mapper/ContractMapper.xml
index 10971f8..4a3621b 100644
--- a/src/main/resources/mapper/ContractMapper.xml
+++ b/src/main/resources/mapper/ContractMapper.xml
@@ -25,7 +25,7 @@
<if test="searcher.status != null">
AND c.status = #{searcher.status}
</if>
- <if test="searcher.depositStatus != null">
+ <if test="searcher.depositStatus != null and !searcher.depositStatus.isEmpty()">
AND c.deposit_status in
<foreach collection="searcher.depositStatus" item="depositStatus" open="(" separator="," close=")">
#{depositStatus}
--
libgit2 0.26.0