From 63d0b2840b8bcb64d16513dcf6a881e6e983faec Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 18 二月 2025 17:41:16 +0800
Subject: [PATCH] 小程序登录
---
ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
index e2da95d..f3b2a4f 100644
--- a/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
+++ b/ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/IndexController.java
@@ -26,6 +26,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -78,6 +79,11 @@
myToDoVO.setContractCount((int) contractCount);
List<String> contractIds = contractService.lambdaQuery().eq(TContract::getTenantId, loginUserApplet.getUserId()).list()
.stream().map(TContract::getId).collect(Collectors.toList());
+ if (CollectionUtils.isEmpty(contractIds)){
+ myToDoVO.setBillCount(0);
+ myToDoVO.setContractCount(0);
+ return R.ok(myToDoVO);
+ }
int billCount = billService.lambdaQuery().in(TBill::getContractId, contractIds).eq(TBill::getPayFeesStatus, 1).list().size();
myToDoVO.setBillCount(billCount);
}else {
@@ -96,7 +102,7 @@
List<TContract> contractList = contractService.lambdaQuery().eq(TContract::getTenantId, loginUserApplet.getUserId())
.eq(TContract::getStatus, 4).list();
List<THouse> houseList = houseService.list();
- List<TBill> bills = billService.lambdaQuery().eq(TBill::getPayFeesStatus,3).orderByDesc(TBill::getPayFeesTime).list();
+ List<TBill> bills = billService.lambdaQuery().orderByDesc(TBill::getPayableFeesTime).list();
for (TContract contract : contractList) {
THouse tHouse = houseList.stream().filter(e -> e.getId().equals(contract.getHouseId())).findFirst().orElse(null);
TBill bill = bills.stream().filter(e -> e.getContractId().equals(contract.getId())).findFirst().orElse(null);
--
Gitblit v1.7.1