修改权限问题

zqy

2025-06-09 bf1ce234766d113ca6380ab4d79cb5b2c5049395

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

@@ -56,9 +56,18 @@
    @Resource
    private RestHighLevelClient restHighLevelClient;

    @Resource
    private ZfEquipShareService zfEquipShareService;

    @Resource
    private ZfEquipDownloadService zfEquipDownloadService;

    @Resource
    private MemoBookService memoBookService;

    private LambdaQueryWrapper<ZfEquipment> buildCondition(ZfEquipment zfEquipment,List<Long> familyIdList) {
        LambdaQueryWrapper<ZfEquipment> lqw = new LambdaQueryWrapper<>();
        lqw.orderByDesc(ZfEquipment::getCreateTime);
        lqw.orderByDesc(ZfEquipment::getHappenTime);
        lqw.like(StringUtils.isNotEmpty(zfEquipment.getName()), ZfEquipment::getName, zfEquipment.getName());
        lqw.like(StringUtils.isNotEmpty(zfEquipment.getBuyer()), ZfEquipment::getBuyer, zfEquipment.getBuyer());
        lqw.like(StringUtils.isNotEmpty(zfEquipment.getContent()), ZfEquipment::getContent, zfEquipment.getContent());
@@ -217,16 +226,26 @@
        //要查自己家庭的
        ZInfoUser myself = zInfoUserService.getMyself();
        Long familyId = myself.getFamilyId();
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            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);

        LambdaQueryWrapper<ZfEquipment> lambdaQueryWrapper = buildCondition(zfEquipment, idList);
        List<ZfEquipment> beanRecords = list(lambdaQueryWrapper);
        log.info("从数据库中查到的为:{}", beanRecords);
        return markOwnData(familyId, beanRecords);
        return markOwnData(familyId, fatherFaId, motherFaId, beanRecords);
    }

    @Override
@@ -256,10 +275,10 @@
//        }).collect(Collectors.toList());
//    }

    public List<ZfEquipment> markOwnData(Long familyId,List<ZfEquipment> beanRecords){
    public List<ZfEquipment> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfEquipment> beanRecords){
        return beanRecords.stream().peek(
                bean -> {
                    if (bean.getFamilyId() == familyId) {
                    if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
                        bean.setOwnData(1);
                    } else {
                        bean.setOwnData(0);
@@ -292,11 +311,22 @@
            return AjaxResult.success("您没加入到对应的家庭，请联系管理员");
        }
        Long familyId = myself.getFamilyId();
        Long fatherFaId = 0L;
        if(myself.getFatherId()!=null)
            fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
        Long motherFaId = 0L;
        if(myself.getMomId()!=null)
            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);
@@ -307,7 +337,7 @@

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

        List<ZfEquipment> dtoResult = markOwnData(familyId, beanRecords);
        List<ZfEquipment> dtoResult = markOwnData(familyId, fatherFaId, motherFaId,beanRecords);

        HashMap<String, Object> data = MapUtils.getResult(pageResult, dtoResult);
        return AjaxResult.success(data);
@@ -565,9 +595,16 @@
            if (!familyIdList.contains(data.getFamilyId())){
                throw new RuntimeException("你没有权限操作此家庭的数据");
            }

            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId(),2017L);
            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }

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

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

@@ -583,6 +620,7 @@
                    }
                }
            });

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