From 099ea14bba367fd86f0dde37d908f07cc04c3d39 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 10 四月 2025 15:38:01 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/xizang
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
index 1fec807..29e2b16 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/ScreenController.java
@@ -147,14 +147,12 @@
.eq(!"0".equals(businessDeptId), TContract::getBusinessDeptId, businessDeptId)
.eq(TContract::getPayType, 2));
List<String> houseIds = tContracts.stream().map(TContract::getHouseId).collect(Collectors.toList());
- if (houseIds.isEmpty()){
- return R.ok(new ArrayList<>());
- }
+
// 获取所有房屋信息
List<THouse> houses = houseService.list(new LambdaQueryWrapper<THouse>()
- .and(wrapper -> wrapper.in(THouse::getId, houseIds)
- .or()
+ .and(wrapper -> wrapper.in(!houseIds.isEmpty(),THouse::getId, houseIds)
+ .or(!houseIds.isEmpty())
.eq(THouse::getLeaseStatus, "1")
)
.eq(!"0".equals(businessDeptId),THouse::getBusinessDeptId, businessDeptId)
--
Gitblit v1.7.1