From 46913f8e05b8b6968f651a0d8cd4b94f726e47e2 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期五, 20 六月 2025 22:35:20 +0800
Subject: [PATCH] 修改了uaid的bug，可以查看到数据了，不能看的就看不了了
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
index c53783f..a53bada 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCollectionServiceImpl.java
@@ -239,7 +239,7 @@
fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
Long motherFaId = 0L;
if(myself.getMomId()!=null)
- motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -250,7 +250,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);
+ }
LambdaQueryWrapper<ZfCollection> lambdaQueryWrapper = buildCondition(zfCollection, idList);
List<ZfCollection> beanRecords = list(lambdaQueryWrapper);
log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
@@ -288,7 +292,7 @@
public List<ZfCollection> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfCollection> 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);
@@ -328,7 +332,7 @@
fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
Long motherFaId = 0L;
if(myself.getMomId()!=null)
- motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
+ motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -339,7 +343,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<ZfCollection> lqw = buildCondition(zfCollection, idList);
--
Gitblit v1.9.1