From 458bed025c92c45ce7cfca3e685b9cb9548c61d3 Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 06 十月 2025 08:54:53 +0800
Subject: [PATCH] 提交证书
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 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 eda53a9..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);
@@ -319,7 +327,7 @@
public List<ZfProperty> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfProperty> beanRecords){
return beanRecords.stream().peek(
bean -> {
- if (bean.getFamilyId() == familyId||(fatherFamilyId!=0L && fatherFamilyId==familyId)||(motherFamilyId!=0L && motherFamilyId==familyId)) {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
bean.setOwnData(1);
} else {
bean.setOwnData(0);
@@ -453,6 +461,8 @@
}
}
+
+
@Resource
ZfLogService zfLogService;
--
Gitblit v1.9.1