From a7d89f329d16e809b4d684d6594ef969629c2f48 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Mar 2024 17:15:53 +0800
Subject: [PATCH] 取保候审查询修改

---
 src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
index d822729..a1e281f 100644
--- a/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
+++ b/src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java
@@ -128,11 +128,13 @@
 
 	@Override
 	public IPage<TaskVO> getBailReportingPage(IPage<TaskVO> page, TaskVO task) {
+		CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
 		// 民警角色
 		if (AuthUtil.getUserRole().equals("mj")) {
-			CommonParamSet commonParamSet = new CommonParamSet().invoke(TaskVO.class, task);
 			task.setUserId(AuthUtil.getUserId());
-			return page.setRecords(baseMapper.selectTaskPageBy(page, task, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator()));
+			return page.setRecords(baseMapper.selectTaskPageBy(page, task,
+				commonParamSet.getRegionChildCodesList(),
+				commonParamSet.getIsAdministrator()));
 		} else {
 			if (AuthUtil.getUserAccount().equals("18879306957")) {
 				task.setCommunityCode("361102003027");
@@ -142,7 +144,12 @@
 				task.setUserId(AuthUtil.getUserId());
 			}
 			// 非民警角色
-			List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page, task);
+			List<TaskVO> taskVOS = baseMapper.getBailReportingPage(page,
+				task,
+				commonParamSet.getRegionChildCodesList(),
+				commonParamSet.getGridCodeList(),
+				commonParamSet.getIsAdministrator());
+			// 返回
 			return page.setRecords(taskVOS);
 		}
 	}

--
Gitblit v1.9.3