From 4961ad3bdeb9bd9247c616a0e029c05b4401353d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 27 二月 2025 16:43:31 +0800
Subject: [PATCH] 小程序管理员接口

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
index 51fa743..e11cd4b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTenantServiceImpl.java
@@ -95,13 +95,19 @@
 
     @Override
     public PageInfo<TBillVO> listBill(TBillAppletQuery query) {
-        List<String> contractIds = contractMapper.selectList(new LambdaQueryWrapper<TContract>()
-                        .eq(TContract::getTenantId, query.getId())).stream().map(TContract::getId)
+        List<TContract> tContracts = contractMapper.selectList(new LambdaQueryWrapper<TContract>()
+                .eq(TContract::getTenantId, query.getId()));
+        List<String> contractIds = tContracts.stream().map(TContract::getId)
                 .collect(Collectors.toList());
         if (contractIds.isEmpty())contractIds.add("0");
         PageInfo<TBillVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
         List<TBillVO> list = this.baseMapper.listBill(query,pageInfo);
         for (TBillVO tBillVO : list) {
+            TContract contract = tContracts.stream().filter(e -> e.getId().equals(tBillVO.getContractId()))
+                    .findFirst().orElse(null);
+            if (contract!=null){
+                tBillVO.setHouse(houseMapper.selectById(contract.getHouseId()));
+            }
             tBillVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tBillVO.getPayFeesStatus()));
         }
         pageInfo.setRecords(list);

--
Gitblit v1.7.1