Merge remote-tracking branch 'origin/master'

feige

2025-06-23 8d0db2a5b91a38960855ab3f5ee3e92fe363e8e2

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java

@@ -8,8 +8,10 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.MemoBook;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZfEconomy;
import com.ruoyi.service.MemoBookService;
import com.ruoyi.service.ZPropertyDownloadService;
import com.ruoyi.service.ZPropertyService;
import com.ruoyi.service.ZPropertyShareService;
@@ -46,6 +48,9 @@

    @Autowired
    private ZPropertyShareService zPropertyShareService;

    @Autowired
    private MemoBookService memoBookService;

    /**
     * 查询所有记录
@@ -145,6 +150,12 @@
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        for (Long id: ids) {
            List<MemoBook> memoBookService1 =  memoBookService.selectByIdAFid(id,2026L);
            if (memoBookService1.size() != 0 && !memoBookService.removeByIds(memoBookService1))
                return AjaxResult.error();
        }

        if (! (zPropertyDownloadService.deleteData(ids) && zPropertyShareService.deleteByContentId(ids)  ) ){
            return AjaxResult.error();
        }