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

2023-12-18 12:00:16 +08:00
parent 47efe37a0e 0ad05e7dc8
commit efb3a7015d
1 changed files with 3 additions and 1 deletions
@@ -138,7 +138,9 @@ public class PortMappingService implements LifecycleBean {
            }
        });
        //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());
    }