diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java index 1678bce15..1256287a5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillPropertyServiceImpl.java @@ -189,7 +189,11 @@ public class WxBillPropertyServiceImpl implements WxBillPropertyService { //押金 WxBillPropertyDeposit depositParam = new WxBillPropertyDeposit(); depositParam.setPropertyContractId((Long) property.get("propertyContractId")); - Map deposit = wxBillPropertyDepositMapper.queryBillDepositList(depositParam).get(0); + Map deposit = null; + List> billDepositList = wxBillPropertyDepositMapper.queryBillDepositList(depositParam); + if (!billDepositList.isEmpty()) { + deposit = billDepositList.get(0); + } Map result = new HashMap<>(2); result.put("property", property); result.put("deposit", deposit); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java index 7d58589e1..126e0196f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillRentServiceImpl.java @@ -188,13 +188,15 @@ public class WxBillRentServiceImpl implements WxBillRentService { //押金 WxBillDeposit depositParam = new WxBillDeposit(); depositParam.setRentContractId((Long) rent.get("rentContractId")); - Map deposit = wxBillDepositMapper.queryBillDepositList(depositParam).get(0); + Map deposit = null; + List> billDepositList = wxBillDepositMapper.queryBillDepositList(depositParam); + if (!billDepositList.isEmpty()) { + deposit = billDepositList.get(0); + } //周期 - //Object weekly = findByMerchantId((Long) rent.get("merchantId")); Map result = new HashMap<>(3); result.put("rent", rent); result.put("deposit", deposit); - //result.put("weekly", weekly); return result; }