zqy
2024-11-05 9b2e78080fd730b87f6aa6fc2c3e89e2c0df5ad9
修改不能删除的bug
5个文件已修改
12 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -152,7 +152,7 @@
    {
        for (Long id: ids) {
            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(id,2026L);
            if (!memoBookService.removeByIds(memoBookService1))
            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -151,7 +151,7 @@
    {
        for (Long id: ids) {
            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(id,2031L);
            if (!memoBookService.removeByIds(memoBookService1))
            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }
        if (! (zSecretDownloadService.deleteData(ids) && zSecretShareService.deleteByContentId(ids)  ) ){
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -566,7 +566,7 @@
                throw new RuntimeException("你没有权限操作此家庭的数据");
            }
            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId().longValue(),2007L);
            if (!memoBookService.removeByIds(memoBookService1))
            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }
zhang-content/src/main/java/com/ruoyi/service/impl/ZfEquipmentServiceImpl.java
@@ -597,7 +597,7 @@
            }
            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(data.getId(),2017L);
            if (!memoBookService.removeByIds(memoBookService1))
            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -275,7 +275,9 @@
            if (!familyIdList.contains(data.getFamilyId())){
                throw new RuntimeException("你没有权限操作此家庭的数据");
            }
            if (!zfPetNoteService.removeBatchByIds(zfPetNoteService.getPetNoteByPetId(data.getId())))
            List<ZfPetNote> petNoteByPetId = zfPetNoteService.getPetNoteByPetId(data.getId());
            if(petNoteByPetId.size() != 0)
            if (!zfPetNoteService.removeBatchByIds(petNoteByPetId))
                return AjaxResult.error();
        }
        if (! (zfPetDownlService.deleteData(ids) && zfPetSharService.deleteByContentId(ids)  ) ){