From ae536b434f6eae2a64b4ce30cd8def726ff05a0a Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期日, 22 六月 2025 22:47:02 +0800 Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend --- zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java index ebfdfb2..fadc2f0 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java +++ b/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<>(); -- Gitblit v1.9.1