From c24698dacd5d43d99bbae35b430a189675a6532b Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期二, 06 五月 2025 17:08:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 aab45cf..dd20954 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
@@ -230,6 +230,7 @@
List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
//鍔犱笂鑷繁瀹跺涵鐨刬d
idList.add(familyId);
+ System.out.println(authority);
//鍔犱笂鐖舵瘝瀹舵棌id
idList.add(fatherFaId);
@@ -293,14 +294,15 @@
Long familyId = myself.getFamilyId();
System.out.println("++++++++++++++++");
System.out.println(familyId);
-
+ System.out.println(myself.getFatherId());
+ System.out.println(zInfoUserService.getInfoById(myself.getFatherId()));
//鏌ョ湅鐖舵瘝鐨勬暟鎹細
Long fatherFaId = 0L;
if(myself.getFatherId()!=null)
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();
--
Gitblit v1.9.1