修改了bug

feige

2024-10-25 81995abfa712d65b7f7f1e23b97a97bc4065103d

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

@@ -56,6 +56,12 @@
    @Resource
    private RestHighLevelClient restHighLevelClient;

    @Resource
    private ZfEquipShareService zfEquipShareService;

    @Resource
    private ZfEquipDownloadService zfEquipDownloadService;

    private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfEquipment::getCreateTime);
@@ -229,6 +235,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);
@@ -303,12 +313,17 @@
            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(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);
@@ -580,6 +595,9 @@
        }

        List<ZfEquipment> zfEquipments = listByIds(Arrays.asList(ids));
        if (! (zfEquipDownloadService.deleteData(ids) && zfEquipShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }

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

@@ -595,6 +613,7 @@
                    }
                }
            });

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