From 690b5ff07ace78fa1f3f4fa1b0508481cf182919 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 31 七月 2023 11:09:02 +0800
Subject: [PATCH] 修复单兵端 - 下发给我的任务列表分页问题
---
ard-work/src/main/java/com/ruoyi/app/task/service/impl/ArdAppTaskServiceImpl.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 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..f8d1f06 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
@@ -84,6 +84,8 @@
@Override
public List<ArdAppTask> selectArdAppTaskListWithDetail(ArdAppTask ardAppTask) {
ardAppTask.setUserId(SecurityUtils.getUserId());
+ ardAppTask.setPageNum(null);
+ ardAppTask.setPageSize(null);
List<ArdAppTask> list1 = ardAppTaskMapper.selectArdAppTaskListWithDetail(ardAppTask);
List<ArdAppTask> list = new ArrayList<>();
list.addAll(list1);
@@ -285,10 +287,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