diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index aceb616..3309ca8 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -119,19 +119,16 @@ public class TaskController extends BladeController { /** * PC端分页显示任务列表 */ - @PostMapping("/list") + @GetMapping("/list") @ApiOperation(value = "分页显示任务列表", notes = "传入task") @OperationAnnotation(moduleName = "巡检管理",title = "我的巡检任务",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, action = "分页显示任务列表") - public R> list(@RequestBody TaskListQuery task) { + public R> list(TaskListQuery task, Query query) { //CacheUtil.put("test#2","inspect","test","12"); // LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new TaskEntity(),task); // queryWrapper.orderByDesc(TaskEntity::getUpdateTime); // IPage pages = taskService.page(Condition.getPage(query), queryWrapper); - Query query = new Query(); - query.setSize(task.getSize()); - query.setCurrent(task.getCurrent()); IPage pages = Condition.getPage(query); if(!AuthUtil.isAdministrator()){ task.setCurUserId(AuthUtil.getUserId());