zqy
2025-06-10 b81f959f7d8180cb26a2879265a1183742609383
zhang-content/src/main/java/com/ruoyi/service/impl/ZfCleanServiceImpl.java
@@ -62,6 +62,12 @@
    @Resource
    RestHighLevelClient restHighLevelClient;
    @Resource
    ZfCleanShareService zfCleanShareService;
    @Resource
    ZfCleanDownloadService zfCleanDownloadService;
    private LambdaQueryWrapper<ZfClean> buildCondition(ZfClean zfClean,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfClean> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfClean::getCreateTime);
@@ -234,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();
@@ -283,7 +289,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);
@@ -320,11 +326,10 @@
        //查看父母的数据:
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            System.out.println("1111111111111111111");
            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();
@@ -605,7 +610,9 @@
        }
        List<ZfClean> zfCleans = listByIds(Arrays.asList(ids));
        if (! (zfCleanDownloadService.deleteData(ids) && zfCleanShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }
        if (zfCleanService.removeByIds(Arrays.asList(ids))) {
            //删除es中的数据