From 413bbb8dbcb2a75ac28850b95aac2d16faf27b7d Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 18 Jan 2024 09:59:52 +0800
Subject: [PATCH] 议事管理bug
---
src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 2974ac2..9c9c440 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
@@ -69,6 +69,7 @@
if (null != dept) {
taskReportForRepairs.setRegionCode(dept.getRegionCode());
}
+ taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
List<String> list = new ArrayList<>();
if (null != taskReportForRepairs.getRoleName() && !taskReportForRepairs.getRoleName().equals("")) {
if (taskReportForRepairs.getRoleName().equals("网格员")) {
@@ -76,11 +77,8 @@
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
} else if (taskReportForRepairs.getRoleName().equals("居民")) {
taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
+ taskReportForRepairs.setConfirmUserId(null);
}
- }
- if (AuthUtil.getUserRole().equals("wygly")) {
- taskReportForRepairs.setRegionCode("");
- taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
}
return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
}
@@ -91,8 +89,8 @@
* @return
*/
@Override
- public TaskReportStatistics getStatisticsCount() {
- return baseMapper.getStatisticsCount(AuthUtil.getUserId());
+ public TaskReportStatistics getStatisticsCount(String houseCode) {
+ return baseMapper.getStatisticsCount(AuthUtil.getUserId(), houseCode);
}
/**
--
Gitblit v1.9.3