增加内容

feige

2023-12-11 fba5960f0ebcc3c652a04ad7c34cc37908195077

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

@@ -214,7 +214,10 @@
//        String secondFamilyIds = listSecondFamilyIds();
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        System.out.println("================");

        Long familyId = myself.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());
@@ -277,11 +280,14 @@
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        System.out.println("++++++++++++++++");
        System.out.println(familyId);
        //也要查别人授权的
        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(idList.size());
//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);
@@ -292,6 +298,8 @@

        List<ZfEvent> beanRecords = pageResult.getRecords();//得到查询出来的数据

        System.out.println(beanRecords);
        System.out.println(beanRecords.size());
        List<ZfEvent> dtoResult = markOwnData(familyId, beanRecords);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);