From 38ff397652a9ef114092f8e7bdbe6d3fede69039 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 Nov 2023 18:04:50 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
index 6c0d3bf..0185983 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java
@@ -60,13 +60,17 @@
@Override
public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
List<String> list = new ArrayList<>();
- if (null!=taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")){
- if (taskReportForRepairs.getRoleName().equals("网格员")){
+ if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
+ if (taskReportForRepairs.getRoleName().equals("网格员")) {
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
- return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
+ // 没有范围，不查询数据
+ if (list.size() > 0) {
+ return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
+ }
+ return page.setRecords(new ArrayList<>());
}
/**
--
Gitblit v1.9.3