From 1e6e1c296add6c168eaa99a8a3e37a9f34d9a2dd Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 10:20:31 +0800
Subject: [PATCH] bug修复

---
 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java |    6 ++----
 1 files changed, 2 insertions(+), 4 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..c8a201f 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));
 	}

--
Gitblit v1.9.3