diff --git a/springboot-backend/src/main/java/com/admin/service/impl/TunnelServiceImpl.java b/springboot-backend/src/main/java/com/admin/service/impl/TunnelServiceImpl.java index 5dd6527..07fd3cd 100644 --- a/springboot-backend/src/main/java/com/admin/service/impl/TunnelServiceImpl.java +++ b/springboot-backend/src/main/java/com/admin/service/impl/TunnelServiceImpl.java @@ -597,7 +597,10 @@ public class TunnelServiceImpl extends ServiceImpl impleme Integer roleId = JwtUtil.getRoleIdFromToken(); Integer userId = JwtUtil.getUserIdFromToken(); if (roleId == 0) { - tunnelEntities = this.list(new QueryWrapper().eq("status", 1)); + tunnelEntities = this.list(new QueryWrapper() + .eq("status", 1) + .orderByAsc("inx") + .orderByAsc("id")); } else { tunnelEntities = java.util.Collections.emptyList(); // 返回空列表 List userTunnels = userTunnelMapper.selectList( @@ -609,7 +612,9 @@ public class TunnelServiceImpl extends ServiceImpl impleme .collect(Collectors.toList()); tunnelEntities = this.list(new QueryWrapper() .in("id", tunnelIds) - .eq("status", 1)); + .eq("status", 1) + .orderByAsc("inx") + .orderByAsc("id")); } }