From 0b55c2c1aaf86f9dc56ca44e81e00943358fb814 Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Tue, 3 Aug 2021 18:08:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8A=A5=E5=91=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=97=B6=E4=BB=8E=E5=89=8D=E7=AB=AF=E4=BC=A0=E9=80=92=E9=A1=B9?= =?UTF-8?q?=E7=9B=AEID#1005590?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --bug=1005590 --user=lyh /test/plan/report/list/{goPage}/{pageSize}，返回的是登陆用户lastprojectId项目下的报告列表 https://www.tapd.cn/55049933/s/1031863 --- .../track/service/TestPlanReportService.java | 10 +++++----- .../track/report/components/TestPlanReportList.vue | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java index 652b931ffd..6ba46ea879 100644 --- a/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java +++ b/backend/src/main/java/io/metersphere/track/service/TestPlanReportService.java @@ -87,15 +87,15 @@ public class TestPlanReportService { private final ExecutorService executorService = Executors.newFixedThreadPool(20); public List list(QueryTestPlanReportRequest request) { + List list = new ArrayList<>(); request.setOrders(ServiceUtils.getDefaultOrder(request.getOrders())); - String projectId = SessionUtils.getCurrentProjectId(); - if (StringUtils.isNotBlank(projectId)) { - request.setProjectId(projectId); + if (StringUtils.isBlank(request.getProjectId())) { + return list; } - List list = extTestPlanReportMapper.list(request); -// this.checkReport(list); + list = extTestPlanReportMapper.list(request); return list; } + // private void checkReport(List list) { // if(CollectionUtils.isNotEmpty(list)){ // for (TestPlanReportDTO dto : list){ diff --git a/frontend/src/business/components/track/report/components/TestPlanReportList.vue b/frontend/src/business/components/track/report/components/TestPlanReportList.vue index 4a6737a0ae..8ff7dfda20 100644 --- a/frontend/src/business/components/track/report/components/TestPlanReportList.vue +++ b/frontend/src/business/components/track/report/components/TestPlanReportList.vue @@ -167,6 +167,7 @@ export default { if (!this.projectId) { return; } + this.condition.projectId = getCurrentProjectID(); this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => { let data = response.data; this.total = data.itemCount;