From bb505db50045104c3de362567b980c7f266f0805 Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Tue, 23 Dec 2025 16:42:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=9D=A3=E5=AF=9F?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobileSupervision/TaskManagementController.java           | 1 +
 .../java/com/biutag/supervision/service/SupTaskService.java   | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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<Page<TaskVo>> 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<SupTaskMapper, SupTask> {
 
     public Page<TaskVo> 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<TaskVo>().setTotal(0).setRecords(new ArrayList<>());
         }
         QueryWrapper<SupTask> queryWrapper = new QueryWrapper<>();
@@ -67,7 +67,7 @@ public class SupTaskService extends ServiceImpl<SupTaskMapper, SupTask> {
                 .eq(StrUtil.isNotEmpty(queryParam.getTaskType()),"t.task_type", queryParam.getTaskType())
                 .groupBy("t.id")
                 .orderByDesc("t.create_time");
-        Page<TaskVo> page=  baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
+        Page<TaskVo> page = baseMapper.queryTaskList(Page.of(queryParam.getCurrent(), queryParam.getSize()), queryWrapper);
         page.getRecords().forEach(s->{
             List<SupTaskPerson> problems =personService.list(new LambdaQueryWrapper<SupTaskPerson>().eq(SupTaskPerson::getTaskId,s.getId()));
             if(CollectionUtil.isNotEmpty(problems)){