diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java index f730398..3a98e46 100644 --- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java +++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java @@ -52,6 +52,7 @@ public class TaskManagementController { public Result> pageResult(TaskQueryParam queryParam) { return Result.success(taskService.pageTaskData(queryParam)); } + @PostMapping("/addTaskManagement") public Result addTaskManagement(@RequestBody TaskManagementDto dto){ if(taskManagementService.save(dto)){ diff --git a/src/main/java/com/biutag/supervision/service/SupTaskService.java b/src/main/java/com/biutag/supervision/service/SupTaskService.java index 284095b..3c250c1 100644 --- a/src/main/java/com/biutag/supervision/service/SupTaskService.java +++ b/src/main/java/com/biutag/supervision/service/SupTaskService.java @@ -58,7 +58,7 @@ public class SupTaskService extends ServiceImpl { public Page pageTaskData(TaskQueryParam queryParam){ UserAuth user = UserContextHolder.getCurrentUser(); - if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) || !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) { + if (!AppConstants.USER_TYPE_SUPER.equals(user.getUserType()) && !user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode())) { return new Page().setTotal(0).setRecords(new ArrayList<>()); } QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -67,7 +67,7 @@ public class SupTaskService extends ServiceImpl { .eq(StrUtil.isNotEmpty(queryParam.getTaskType()),"t.task_type", queryParam.getTaskType()) .groupBy("t.id") .orderByDesc("t.create_time"); - Page page= baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); + Page page = baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper); page.getRecords().forEach(s->{ List problems =personService.list(new LambdaQueryWrapper().eq(SupTaskPerson::getTaskId,s.getId())); if(CollectionUtil.isNotEmpty(problems)){