From 6a37f2387eb5342f87395efcb02cd681e6da1db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=99=BD=E5=B0=81=E7=BE=BD?= <2360164671@qq.com> Date: Tue, 12 Jul 2022 16:30:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86upperBound=E7=9A=84?= =?UTF-8?q?=E8=BE=B9=E7=95=8C=E9=97=AE=E9=A2=98=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E5=BC=82=E5=B8=B8=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rmdjzz/projectmanagement/service/ITaskService.java | 2 +- .../projectmanagement/service/impl/TaskServiceImpl.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java index 1951822..edce239 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/ITaskService.java @@ -38,7 +38,7 @@ public interface ITaskService extends IService { */ Integer getHolderLevel(String token, Long taskId); - List listMyTasks(String token, Integer projectId) throws BadRequestException; + List listMyTasks(String token, Integer projectId) throws BadRequestException, ForbiddenException; Boolean canBeDone(Long taskId); diff --git a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java index 35f3b41..6a8a4b2 100644 --- a/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java +++ b/src/main/java/cn/edu/hfut/rmdjzz/projectmanagement/service/impl/TaskServiceImpl.java @@ -210,6 +210,8 @@ public class TaskServiceImpl extends ServiceImpl implements IT private int upperBound(List data, long x) { int l = 0, r = data.size() - 1; + if(data.get(r).getTaskFatherId().equals(x)) + return r; while (l < r) { int mid = (l + r) / 2; if (data.get(mid).getTaskFatherId() <= x) l = mid + 1; @@ -220,8 +222,11 @@ public class TaskServiceImpl extends ServiceImpl implements IT @Override - public List listMyTasks(String token, Integer projectId) { + public List listMyTasks(String token, Integer projectId) throws ForbiddenException { Integer staffId = TokenUtils.getStaffId(token); + if(projectGroupService.getProjectAccessLevel(token,projectId)==0){ + throw new ForbiddenException("不可操作的项目"); + } List resList = baseMapper.selectList(Wrappers.lambdaQuery() .select(Task::getTaskId, Task::getTaskFatherId, Task::getTaskHolderId) .eq(Task::getTaskProjectId, projectId)