修改家庭收支台账 宠物问题

zqy

2025-05-20 227402da809c41d33fe206f7a5e88a08e17c18f6

 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java

@@ -55,6 +55,12 @@
    private EsService esSer;

    @Resource
    private ZfEventDownloadService zfEventDownloadService;

    @Resource
    private ZfEventShareService zfEventShareService;

    @Resource
    private RestHighLevelClient restHighLevelClient;
    private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfEvent> lqw = new LambdaQueryWrapper<>();
@@ -217,13 +223,14 @@
            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();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);
        System.out.println(authority);

        //加上父母家族id
        idList.add(fatherFaId);
@@ -287,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();
@@ -567,9 +575,11 @@
        }

        List<ZfEvent> zfEvents = listByIds(Arrays.asList(ids));
        if (! (zfEventDownloadService.deleteData(ids) && zfEventShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }

        if (zfEventService.removeByIds(Arrays.asList(ids))) {

            //删除es中的数据
            zfEvents.stream().forEach(zfEvent -> {
                EsModel esModel = esSer.findByCtId(zfEvent.getId(), "家大事记");
@@ -583,6 +593,7 @@
                }
            });


            return AjaxResult.success();
        }else {
            return AjaxResult.error();