zqy
5 天以前 b02beccf4567068cb47a3f1181a00039456c872d
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -228,6 +228,18 @@
        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EVENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //根据uaid查询相同名字下别的家庭里自己的数据
     //   Long fmid;
        System.out.println(myself.getUaid());
        List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
        if(!fms.isEmpty())
        {
            System.out.println("[[[[[[[[[[[}}}}}}}}}}}}}}}}}}");
            idList.addAll(fms);
        }
        //加上自己家庭的id
        idList.add(familyId);
        System.out.println(authority);
@@ -313,8 +325,13 @@
        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);
   //     System.out.println(myself.getUaid());
        List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
        if(!fms.isEmpty())
        {
            idList.addAll(fms);
        }
        System.out.println(idList.size());
//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent, idList);