修改了bug

feige

2024-11-20 d0850c1c55c5f709874cde1b5f292813fbd3af5e

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

@@ -56,6 +56,15 @@
    @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);
@@ -307,7 +316,7 @@
            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());
@@ -586,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))) {

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

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