From 3b2f654b1a605d258c5e16c7617df80e9eb6f81b Mon Sep 17 00:00:00 2001 From: zqy <2522236926@qq.com> Date: 星期六, 02 八月 2025 00:29:41 +0800 Subject: [PATCH] 修改bug --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java index 7f54cf3..e5c421d 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java @@ -240,7 +240,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(); @@ -251,7 +251,11 @@ //鍔犱笂鐖舵瘝鐨刬d 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<ZfClean> lambdaQueryWrapper = buildCondition(zfClean, idList); List<ZfClean> beanRecords = list(lambdaQueryWrapper); log.info("浠庢暟鎹簱涓煡鍒扮殑涓�:{}", beanRecords); @@ -289,7 +293,7 @@ public List<ZfClean> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId,List<ZfClean> 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); @@ -340,6 +344,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<ZfClean> lqw = buildCondition(zfClean, idList); -- Gitblit v1.9.1