Merge remote-tracking branch 'origin/master'

feige

2024-11-05 b4895bdc5d9268e55c0023b92cc7c2d68ba33e46

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

@@ -49,6 +49,16 @@
    
    @Resource
    ZAuthorityService zAuthorityService;

    @Resource
    ZfPetNoteService zfPetNoteService;

    @Resource
    ZfPetSharService zfPetSharService;

    @Resource
    ZfPetDownlService zfPetDownlService;

    @Override
    public AjaxResult selectDataList(ZfPet zfPet, Integer pageNum, Integer pageSize) {
//        LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet);
@@ -265,6 +275,11 @@
            if (!familyIdList.contains(data.getFamilyId())){
                throw new RuntimeException("你没有权限操作此家庭的数据");
            }
            if (!zfPetNoteService.removeBatchByIds(zfPetNoteService.getPetNoteByPetId(data.getId())))
                return AjaxResult.error();
        }
        if (! (zfPetDownlService.deleteData(ids) && zfPetSharService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }

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