From 061f8f5f29fbc3c34719be14b6d178a92b636f78 Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期六, 14 六月 2025 21:58:39 +0800 Subject: [PATCH] 同名同电话号码可以共享数据了 --- zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java index 987ec1a..9fffd7f 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java @@ -244,7 +244,11 @@ //鍔犱笂鐖舵瘝瀹舵棌id idList.add(fatherFaId); idList.add(motherFaId); - + List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList()); + if(!fms.isEmpty()) + { + idList.addAll(fms); + } // String familyIds = listFamilyIds(); // String secondFamilyAuthority = listSecondFamilyIds(); LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, idList); @@ -300,7 +304,11 @@ //鍔犱笂鐖舵瘝瀹舵棌id idList.add(fatherFaId); idList.add(motherFaId); - + List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList()); + if(!fms.isEmpty()) + { + idList.addAll(fms); + } // String familyIds = listFamilyIds(); // String secondFamilyAuthority = listSecondFamilyIds(); LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty, idList); -- Gitblit v1.9.1