修改了bug

feige

2024-10-18 312e09da912a5d5bee2228af3f888e06088902ec

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

@@ -208,11 +208,11 @@
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        Long familyId = myself.getFamilyId();

        //也要查别人授权的
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CONTACT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);

        LambdaQueryWrapper<ZfContact> lambdaQueryWrapper = buildCondition(zfContact, idList);
        List<ZfContact> beanRecords = list(lambdaQueryWrapper);
@@ -285,10 +285,21 @@
        }
        Long familyId = myself.getFamilyId();
        //也要查别人授权的
//
//        System.out.println("--------------7777----------------");
//
//        System.out.println(familyId);
        List<ZAuthority> authority = zAuthorityService.getAuthority();
        List<Long> idList = authority.stream().filter(auth -> auth.getAuthority().toString().equals(CONTACT_LIST)).map(ZAuthority::getFid).collect(Collectors.toList());
        //加上自己家庭的id
        idList.add(familyId);
//
//        System.out.println(idList.size());
//        System.out.println(idList.get(0));
//
//        System.out.println("------------------------------");
        idList.add(familyId);

//        String familyIds = listFamilyIds();
//        String secondFamilyAuthority = listSecondFamilyIds();
        LambdaQueryWrapper<ZfContact> lqw = buildCondition(zfContact, idList);
@@ -450,9 +461,7 @@
        log.info("数据列表为：{}", dataList);

        for (ZfContact zfContact : dataList) {
            if (zfContact.getNickName().length() != 0 && zfContact.getName().length() != 0 && zfContact.getMyName().length() != 0 ) {
                zfContactService.addData(zfContact);
            }
        }

        return AjaxResult.success("导入数据成功");