From 4ea0bdf2725618ed8a2d809c8183a452624f8395 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 29 Dec 2023 14:18:56 +0800
Subject: [PATCH] 物业管理员只能查询移交给自己的报事报修

---
 src/main/java/org/springblade/modules/task/service/impl/TaskReportForRepairsServiceImpl.java |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 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 ecb4b8e..b1451a4 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
@@ -17,7 +17,6 @@
 package org.springblade.modules.task.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.springblade.common.utils.SpringUtils;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.modules.grid.entity.GridmanEntity;
@@ -28,7 +27,6 @@
 import org.springblade.modules.task.entity.TaskEntity;
 import org.springblade.modules.task.entity.TaskReportForRepairsEntity;
 import org.springblade.modules.task.mapper.TaskReportForRepairsMapper;
-import org.springblade.modules.task.service.ITaskRepairStepService;
 import org.springblade.modules.task.service.ITaskReportForRepairsService;
 import org.springblade.modules.task.service.ITaskService;
 import org.springblade.modules.task.vo.TaskReportForRepairsVO;
@@ -68,7 +66,7 @@
 	@Override
 	public IPage<TaskReportForRepairsVO> selectTaskReportForRepairsPage(IPage<TaskReportForRepairsVO> page, TaskReportForRepairsVO taskReportForRepairs) {
 		Dept dept = deptService.getById(AuthUtil.getDeptId());
-		if (null!=dept){
+		if (null != dept) {
 			taskReportForRepairs.setRegionCode(dept.getRegionCode());
 		}
 		List<String> list = new ArrayList<>();
@@ -78,16 +76,18 @@
 				list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
 			} else if (taskReportForRepairs.getRoleName().equals("居民")) {
 				taskReportForRepairs.setCreateUser(AuthUtil.getUserId());
-			} else if (taskReportForRepairs.getRoleName().equals("物业")) {
-				taskReportForRepairs.setRegionCode("");
-				taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
 			}
 		}
-		return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs,list));
+		if (AuthUtil.getUserRole().equals("wygly")) {
+			taskReportForRepairs.setRegionCode("");
+			taskReportForRepairs.setConfirmUserId(AuthUtil.getUserId());
+		}
+		return page.setRecords(baseMapper.selectTaskReportForRepairsPage(page, taskReportForRepairs, list));
 	}
 
 	/**
 	 * 查询报事报修统计
+	 *
 	 * @return
 	 */
 	@Override
@@ -97,6 +97,7 @@
 
 	/**
 	 * 报事报修任务表 新增
+	 *
 	 * @param taskReportForRepairs
 	 * @return
 	 */
@@ -109,23 +110,24 @@
 		taskEntity.setStatus(1);
 		taskEntity.setType(1);
 		taskEntity.setFrequency(3);
-		if (null!=taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")){
+		if (null != taskReportForRepairs.getAddressCode() && !taskReportForRepairs.getAddressCode().equals("")) {
 			taskEntity.setHouseCode(taskReportForRepairs.getAddressCode());
 		}
 		// 新增
 		boolean save = taskService.save(taskEntity);
-		if (save){
+		if (save) {
 			taskReportForRepairs.setTaskId(taskEntity.getId());
 			taskReportForRepairs.setConfirmFlag(1);
 			flag = save(taskReportForRepairs);
 			// 同时向web 端推送消息
-			SSEServer.sendMessage("web:1","1");
+			SSEServer.sendMessage("web:1", "1");
 		}
 		return flag;
 	}
 
 	/**
 	 * 报事报修任务表 自定义修改
+	 *
 	 * @param taskReportForRepairs
 	 * @return
 	 */
@@ -140,6 +142,7 @@
 
 	/**
 	 * 报事报修任务表 审核
+	 *
 	 * @param taskReportForRepairs
 	 * @return
 	 */
@@ -165,8 +168,8 @@
 	}
 
 	@Override
-	public Integer getStatistics(Long userId,String neiCode) {
-		return baseMapper.getStatistics(userId,neiCode);
+	public Integer getStatistics(Long userId, String neiCode) {
+		return baseMapper.getStatistics(userId, neiCode);
 	}
 
 	/**

--
Gitblit v1.9.3