Merge remote-tracking branch 'origin/dev' into dev

dromara · Dec 18, 2023 · efb3a70 · efb3a70
2 parents 47efe37 + 0ad05e7
commit efb3a70
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...oxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java b/...oxy-server/src/main/java/org/dromara/neutrinoproxy/server/service/PortMappingService.java
@@ -138,7 +138,9 @@ public PageInfo<PortMappingListRes> page(PageQuery pageQuery, PortMappingListReq
             }
         });
         //sorted [userId asc] [licenseId asc] [createTime asc]
-        respList = respList.stream().sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
+        respList = respList.stream()
+            .filter(e -> null != e.getUserId())
+            .sorted(Comparator.comparing(PortMappingListRes::getUserId).thenComparing(PortMappingListRes::getLicenseId).thenComparing(PortMappingListRes::getCreateTime)).collect(Collectors.toList());
         return PageInfo.of(respList, page.getTotal(), pageQuery.getCurrent(), pageQuery.getSize());
     }