Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java

@@ -87,10 +87,11 @@
    public List<Long> getAll(){
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();

        List<Long> allList = new ArrayList<>();
        Long source = zfShareDataService.getSource(userId);
        List<Long> allList = zfShareDataService.getAllPerson(Collections.singletonList(source));
        allList.add(source);
        allList.addAll(zfShareDataService.getAllPerson(Collections.singletonList(source)));

        List<Long> collect = allList.stream().distinct().collect(Collectors.toList());

        List<Long> all = new ArrayList<>();