diff --git a/src/main/java/com/biutag/supervision/mapper/SupRotaMapper.java b/src/main/java/com/biutag/supervision/mapper/SupRotaMapper.java
index 101bfb4..5bff88f 100644
--- a/src/main/java/com/biutag/supervision/mapper/SupRotaMapper.java
+++ b/src/main/java/com/biutag/supervision/mapper/SupRotaMapper.java
@@ -18,7 +18,7 @@ public interface SupRotaMapper extends BaseMapper<SupRota> {
             "b.rota_station as rotaStation, " +
             "b.phone as phone " +
             " from sup_depart a " +
-            "LEFT JOIN sup_rota b on a.id = b.dept_code and  b.rota_time = #{dateTime} " +
+            "LEFT JOIN sup_rota b on a.id = b.dept_code and  b.start_time <= #{dateTime}  and b.end_time >= #{dateTime}" +
             "where statistics_group_id = #{groupId} ")
     List<SupRotaVo> getSubofficeData(String dateTime,String groupId);
 
@@ -31,7 +31,7 @@ public interface SupRotaMapper extends BaseMapper<SupRota> {
             "b.rota_station as rotaStation, " +
             "b.phone as phone " +
             " from sup_depart a " +
-            "LEFT JOIN sup_rota b on a.id = b.dept_code and  b.rota_time = #{dateTime} " +
+            "LEFT JOIN sup_rota b on a.id = b.dept_code and b.start_time <= #{dateTime}  and b.end_time >= #{dateTime} " +
             "where a.pid =#{departId} ")
     List<SupRotaVo> getSupRotaList(String dateTime,String departId);
 }
diff --git a/src/main/java/com/biutag/supervision/service/SupRotaService.java b/src/main/java/com/biutag/supervision/service/SupRotaService.java
index 5c1070b..a783114 100644
--- a/src/main/java/com/biutag/supervision/service/SupRotaService.java
+++ b/src/main/java/com/biutag/supervision/service/SupRotaService.java
@@ -17,6 +17,8 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
 
@@ -35,9 +37,23 @@ public class SupRotaService extends ServiceImpl<SupRotaMapper, SupRota> {
         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);
+
+            // 获取当前的本地时间
+            LocalTime currentTime = LocalTime.now();
+
+            // 定义时间格式化为字符串的格式
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("HH:mm:ss");
+
+            // 将本地时间格式化为字符串
+            String timeString = currentTime.format(formatter);
+
+            String dateTime=queryParam.getDate() + " "+timeString;
             //市局的数据进行分类
             //市局本身
-            List<SupRota> supRota = baseMapper.selectList(new LambdaQueryWrapper<SupRota>().eq(SupRota::getDeptCode,supDepart.getId()).eq(SupRota::getRotaTime,queryParam.getDate()));
+            List<SupRota> supRota = baseMapper.selectList(new LambdaQueryWrapper<SupRota>()
+                    .eq(SupRota::getDeptCode,supDepart.getId())
+                    .ge(SupRota::getStartTime,dateTime)
+                    .le(SupRota::getEndTime,dateTime));
             jsonObject.fluentPut("cityBureau",supRota);
             //分局
             List<SupRotaVo> suboffice =baseMapper.getSubofficeData(queryParam.getDate(),"3");