From 79b466a6b77ed62f2275f97c5812a26da27ca489 Mon Sep 17 00:00:00 2001
From: Administrator <ard@qq.com>
Date: 星期二, 01 八月 2023 13:45:01 +0800
Subject: [PATCH] 优化app历史任务列表
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
index c19876b..09c1a93 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java
@@ -70,7 +70,6 @@
* @return app浠诲姟绠＄悊
*/
@Override
- @DataScope(deptAlias = "d", userAlias = "u")
public List<ArdAppTask> selectArdAppTaskList(ArdAppTask ardAppTask) {
return ardAppTaskMapper.selectArdAppTaskList(ardAppTask);
}
@@ -83,20 +82,13 @@
*/
@Override
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
- ardAppTask.setUserId(SecurityUtils.getUserId());
- List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
- List<ArdAppTask> list = new ArrayList<>();
- list.addAll(list1);
+ List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
return list;
-
}
@Override
public List<ArdAppTask> selectArdAppTaskListWithDetailById(ArdAppTask ardAppTask) {
- ardAppTask.setUserId(SecurityUtils.getUserId());
- List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetailById(ardAppTask);
- List<ArdAppTask> list = new ArrayList<>();
- list.addAll(list1);
+ List<ArdAppTask> list = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
return list;
}
@@ -285,10 +277,12 @@
@Override
public ArdAppTask selectNewArdAppTaskByUserId(String userId) {
ArdAppTask ardAppTask = ardAppTaskMapper.selectNewArdAppTaskByUserId(userId);
- ArdAppTaskDetail detail=new ArdAppTaskDetail();
- detail.setViewFlag("1");
- detail.setTaskId(ardAppTask.getId());
- int i = ardAppTaskMapper.updateArdAppTaskDetailByTaskId(detail);
+ if(StringUtils.isNotNull(ardAppTask)) {
+ ArdAppTaskDetail detail = new ArdAppTaskDetail();
+ detail.setViewFlag("1");
+ detail.setTaskId(ardAppTask.getId());
+ int i = ardAppTaskMapper.updateArdAppTaskDetailByTaskId(detail);
+ }
return ardAppTask;
}
/**
--
Gitblit v1.9.3