zqy
2024-10-15 57081da59de75e5ae202017151dc5616b3f4f5fe
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -229,6 +229,10 @@
        //加上自己家庭的id
        idList.add(familyId);
        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);
        LambdaQueryWrapper<ZfEquipment> lambdaQueryWrapper = buildCondition(zfEquipment, idList);
        List<ZfEquipment> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
@@ -309,6 +313,11 @@
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(EQUIPMENT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);
        //加上父母家族id
        idList.add(fatherFaId);
        idList.add(motherFaId);
//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfEquipment> lqw = buildCondition(zfEquipment, idList);