From dbd15586146974c0c22c99f2321c77c2968b3806 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 28 二月 2025 16:31:07 +0800
Subject: [PATCH] 权限

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
index 2152931..d6f9f12 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TContractController.java
@@ -184,15 +184,13 @@
         if (contractRentType!=null){
             BeanUtils.copyProperties(contractRentType,res);
         }
-        TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
-                        .eq(TContract::getHouseId,contract.getHouseId())
-                .eq(TContract::getStatus, 4)
-                .le(TContract::getStartTime, LocalDateTime.now())
-                .ge(TContract::getEndTime, LocalDateTime.now()));
+//        TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>()
+//                        .eq(TContract::getHouseId,contract.getHouseId())
+//                .eq(TContract::getStatus, 4)
+//                .le(TContract::getStartTime, LocalDateTime.now())
+//                .ge(TContract::getEndTime, LocalDateTime.now()));
         THouse house = houseService.getById(contract.getHouseId());
-        if (oldContract!=null){
-            house.setTenantType(oldContract.getPayType());
-        }
+        house.setTenantType(contract.getPayType());
         res.setHouse(house);
         List<TBill> list = billService.lambdaQuery()
                 .eq(TBill::getContractId, id)

--
Gitblit v1.7.1