From b200b681bc401bb11c133a79273ba78cb6ebedf8 Mon Sep 17 00:00:00 2001 From: huanghongfa <huanghongfa123456> Date: 星期五, 30 七月 2021 18:16:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java index 35b86db..9354692 100644 --- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java +++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/VisitingTasksApi.java @@ -32,16 +32,16 @@ @ApiOperation(value = "走访记录-xyh", response = AppVisitTasksVO.class) @PostMapping("/list") public R list(@RequestBody EventTasksQuery query){ - query.setCommunityId(this.getCommunityId()); +// query.setCommunityId(this.getCommunityId()); return gridService.list(query); } @ApiOperation(value = "走访任务-xyh", response = AppVisitTasksVO.class) @PostMapping("/taskList") public R taskList(@RequestBody EventTasksQuery query){ - query.setCommunityId(this.getCommunityId()); - query.setUserId(this.getUserId()); - return gridService.taskList(query); +// query.setCommunityId(this.getCommunityId()); +// query.setUserId(this.getUserId()); + return gridService.appTaskList(query); } @ApiOperation(value = "走访详情-xyh", response = EventVisitingTasksDetailsVO.class) -- Gitblit v1.7.1