From 3ee06bd46c3809fdd00e509debd97dcd039ed031 Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期二, 15 四月 2025 21:00:11 +0800 Subject: [PATCH] 修改家谱中会显示超出范围的数据&家族模块的导出 --- 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