From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 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 c4cfcf4..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
@@ -233,7 +233,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();
@@ -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;
 
@@ -566,7 +576,7 @@
                 throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
             }
             List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId().longValue(),2007L);
-            if (!memoBookService.removeByIds(memoBookService1))
+            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                 return AjaxResult.error();
 
         }

--
Gitblit v1.9.1