Merge branch 'master' into feature/master-homepage-20260115

airport-item/src/main/java/com/sundot/airport/item/service/impl/UserRankingServiceImpl.java

@@ -235,10 +235,10 @@ public class UserRankingServiceImpl implements UserRankingService {
         Long brigadeId = findBrigadeIdByUser(user);
         List<SysUser> brigadeIdUsers = new ArrayList<>();
         if (brigadeId != null) {
-            stationUsers = sysUserService.selectUserListByRoleKeyAndDeptId(
+            brigadeIdUsers = sysUserService.selectUserListByRoleKeyAndDeptId(
                     Arrays.asList(RoleTypeEnum.banzuzhang.getCode(), RoleTypeEnum.SecurityCheck.getCode()),
                     brigadeId);
-            if (CollectionUtil.isEmpty(stationUsers)) {
+            if (CollectionUtil.isEmpty(brigadeIdUsers)) {
                 return null;
             }
         }
@@ -250,6 +250,7 @@ public class UserRankingServiceImpl implements UserRankingService {
             case "brigade":
                 // 查询大队下所有用户
                 users.addAll(brigadeIdUsers);
+                dto.setInspectBrigadeId(brigadeId);
                 return itemLargeScreenMapper.rankByIndividual(dto);
             case "department":
                 if (RoleTypeEnum.banzuzhang.getCode().equals(sysRole.getRoleKey()) ||