From 1278feced4261a2af3f4373509a9093266e44dfc Mon Sep 17 00:00:00 2001
From: wxc <191104855@qq.com>
Date: Thu, 24 Jul 2025 17:58:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=9D=A3=E5=AF=9FAPP?=
 =?UTF-8?q?=20BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/mobileSupervision/TaskController.java         | 5 +++++
 .../mobileSupervision/TaskManagementController.java          | 5 -----
 .../com/biutag/supervision/pojo/param/SupRotaQueryParam.java | 1 +
 .../java/com/biutag/supervision/service/SupRotaService.java  | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskController.java b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskController.java
index 9436e6c..b59ab7f 100644
--- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskController.java
+++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskController.java
@@ -36,6 +36,11 @@ public class TaskController {
         return Result.success(taskService.getTaskCount());
     }
 
+    @GetMapping("detail")
+    public Result<SupTask> get(Integer id) {
+        return Result.success(taskService.getById(id));
+    }
+
     @GetMapping("count/all")
     public Result<TaskCountVo> countAll() {
         long todoCount = taskService.count(new LambdaQueryWrapper<SupTask>().eq(SupTask::getTaskStatus, WorkStatusEnum.todo.name()));
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 04ae132..f730398 100644
--- a/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java
+++ b/src/main/java/com/biutag/supervision/controller/mobileSupervision/TaskManagementController.java
@@ -11,18 +11,14 @@ import com.alibaba.excel.read.listener.ReadListener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.biutag.supervision.pojo.Result;
-import com.biutag.supervision.pojo.dto.DataCaseVerifImportDto;
 import com.biutag.supervision.pojo.dto.SupRiskDto;
 import com.biutag.supervision.pojo.dto.TaskManagementDto;
 import com.biutag.supervision.pojo.dto.TemperancePoliceDto;
 import com.biutag.supervision.pojo.entity.RiskPersonInfo;
 import com.biutag.supervision.pojo.entity.SupDepart;
 import com.biutag.supervision.pojo.entity.SupPolice;
-import com.biutag.supervision.pojo.entity.SupRiskPersonal;
-import com.biutag.supervision.pojo.param.TaskInspectionQueryParam;
 import com.biutag.supervision.pojo.param.TaskQueryParam;
 import com.biutag.supervision.pojo.param.TaskRiskPersonalQueryParam;
-import com.biutag.supervision.pojo.vo.TaskInspectionVo;
 import com.biutag.supervision.pojo.vo.TaskVo;
 import com.biutag.supervision.service.*;
 import lombok.RequiredArgsConstructor;
@@ -52,7 +48,6 @@ public class TaskManagementController {
 
         private final RiskPersonInfoService riskPersonInfoService;
 
-
         @GetMapping
         public Result<Page<TaskVo>> pageResult(TaskQueryParam queryParam) {
             return Result.success(taskService.pageTaskData(queryParam));
diff --git a/src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java b/src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java
index 16f43e3..5614e46 100644
--- a/src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java
+++ b/src/main/java/com/biutag/supervision/pojo/param/SupRotaQueryParam.java
@@ -10,6 +10,7 @@ import java.util.Date;
 @Getter
 @Setter
 public class SupRotaQueryParam {
+
     private String deptId;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/biutag/supervision/service/SupRotaService.java b/src/main/java/com/biutag/supervision/service/SupRotaService.java
index 5be1be1..5c1070b 100644
--- a/src/main/java/com/biutag/supervision/service/SupRotaService.java
+++ b/src/main/java/com/biutag/supervision/service/SupRotaService.java
@@ -1,5 +1,6 @@
 package com.biutag.supervision.service;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,7 +32,7 @@ public class SupRotaService extends ServiceImpl<SupRotaMapper, SupRota> {
         //判断传入的id是市局、还是分局
 
         JSONObject jsonObject=new JSONObject();
-        if (user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode()) || user.getRoleCodes().contains(RoleCodeEnum.ADMIN.getCode()) ) {
+        if (StrUtil.isBlank(queryParam.getDeptId()) && (user.getRoleCodes().contains(RoleCodeEnum.FIRST_ADMIN.getCode()) || user.getRoleCodes().contains(RoleCodeEnum.ADMIN.getCode()))) {
 
             SupDepart supDepart = departService.getById(AppConstants.ROOT_DEPART_ID);
             //市局的数据进行分类
@@ -44,7 +45,7 @@ public class SupRotaService extends ServiceImpl<SupRotaMapper, SupRota> {
             //局属单位
             List<SupRotaVo> departmental =baseMapper.getSubofficeData(queryParam.getDate(),"4");
             jsonObject.fluentPut("departmental",departmental);
-        }else{
+        } else {
             List<SupRotaVo> supRotaList = baseMapper.getSupRotaList(queryParam.getDate(),queryParam.getDeptId());
             jsonObject.fluentPut("supRotaList",supRotaList);
         }