From ca93fe7eb03bec91d5cb9f45ebb3b6c98819b7ff Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Dec 2023 18:01:09 +0800
Subject: [PATCH] 我的任务，里面审核搜索加上时间条件
---
src/main/java/org/springblade/modules/task/service/impl/TaskServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 6d5fcff..9867936 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
@@ -32,6 +32,7 @@
import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
/**
@@ -56,12 +57,13 @@
public IPage<TaskVO> selectTaskPage(IPage<TaskVO> page, TaskVO task) {
task.setUserId(AuthUtil.getUserId());
// 民警角色
- if (AuthUtil.getUserRole().contains("mj")) {
+ if (AuthUtil.getUserRole().equals("mj")) {
task.setUserId(AuthUtil.getUserId());
return page.setRecords(baseMapper.selectTaskPageBy(page, task));
} else {
// 非民警角色
- return page.setRecords(baseMapper.selectTaskPage(page, task));
+ List<TaskVO> taskVOS = baseMapper.selectTaskPage(page, task);
+ return page.setRecords(taskVOS);
}
}
--
Gitblit v1.9.3