From 4d99846dcd82ffb0f1a207240b7609a224e8e84e Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期二, 21 十月 2025 14:58:59 +0800
Subject: [PATCH] 修改了一个bug

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index 429131d..a768486 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -57,6 +57,12 @@
     @Resource
     RestHighLevelClient restHighLevelClient;
 
+    @Resource
+    ZfContactShraServiceImpl zfContactShraService;
+
+    @Resource
+    ZfContactDownlService zfContactDownlService;
+
 
     private LambdaQueryWrapper<ZfContact> buildCondition(ZfContact zfContact,List<Long> familyIdList) {
         LambdaQueryWrapper<ZfContact> lqw = new LambdaQueryWrapper<>();
@@ -208,16 +214,33 @@
         //瑕佹煡鑷繁瀹跺涵鐨�
         ZInfoUser myself = zInfoUserService.getMyself();
         Long familyId = myself.getFamilyId();
+
+        //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+        Long fatherFaId = 0L;
+        if(myself.getFatherId()!=null)
+            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+        Long motherFaId = 0L;
+        if(myself.getMomId()!=null)
+            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
         List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CONTACT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
         //鍔犱笂鑷繁瀹跺涵鐨刬d
         idList.add(familyId);
 
+        //鍔犱笂鐖舵瘝瀹舵棌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<ZfContact> lambdaQueryWrapper = buildCondition(zfContact, idList);
         List<ZfContact> beanRecords = list(lambdaQueryWrapper);
         log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords);
-        return markOwnData(familyId, beanRecords);
+        return markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
     }
 
     @Override
@@ -248,10 +271,10 @@
 //        }).collect(Collectors.toList());
 //    }
 
-    public List<ZfContact> markOwnData(Long familyId,List<ZfContact> beanRecords){
+    public List<ZfContact> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfContact> beanRecords){
         return beanRecords.stream().peek(
                 bean -> {
-                    if (bean.getFamilyId() == familyId) {
+                    if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
                         bean.setOwnData(1);
                     } else {
                         bean.setOwnData(0);
@@ -284,11 +307,29 @@
             return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
         }
         Long familyId = myself.getFamilyId();
+
+        //鏌ョ湅鐖舵瘝鐨勬暟鎹細
+        Long fatherFaId = 0L;
+        if(myself.getFatherId()!=null)
+            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
+        Long motherFaId = 0L;
+        if(myself.getMomId()!=null)
+            motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+
         //涔熻鏌ュ埆浜烘巿鏉冪殑
         List<ZAuthority> authority = zAuthorityService.getAuthority();
         List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CONTACT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
         //鍔犱笂鑷繁瀹跺涵鐨刬d
         idList.add(familyId);
+
+        //鍔犱笂鐖舵瘝瀹舵棌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<ZfContact> lqw = buildCondition(zfContact, idList);
@@ -299,7 +340,7 @@
 
         List<ZfContact> beanRecords = pageResult.getRecords();//寰楀埌鏌ヨ鍑烘潵鐨勬暟鎹�
 
-        List<ZfContact> dtoResult = markOwnData(familyId, beanRecords);
+        List<ZfContact> dtoResult = markOwnData(familyId,fatherFaId, motherFaId, beanRecords);
 
         HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
         return AjaxResult.success(data);
@@ -567,6 +608,9 @@
 
         List<ZfContact> zfContacts = listByIds(Arrays.asList(ids));
 
+        if (! (zfContactDownlService.deleteData(ids) && zfContactShraService.deleteByContentId(ids)  ) ){
+            return AjaxResult.error();
+        }
         if (zfContactService.removeByIds(Arrays.asList(ids))) {
 
             //鍒犻櫎es涓殑鏁版嵁

--
Gitblit v1.9.1