From 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期一, 23 六月 2025 20:20:58 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java index 94af75e..dcdab4b 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java @@ -325,13 +325,10 @@ //鍔犱笂鐖舵瘝瀹舵棌id idList.add(fatherFaId); idList.add(motherFaId); - System.out.println(myself.getUaid()); - + // System.out.println(myself.getUaid()); List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList()); - if(!fms.isEmpty()) { - idList.addAll(fms); } -- Gitblit v1.9.1