7 天以前 19ed9b41cf75f132fe081ece5a20966611ccd123
Merge remote-tracking branch 'origin/dev_business' into dev_business
已修改1个文件
8 ■■■■ 文件已修改
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/service/item/MdmItemServiceImpl.java
@@ -179,10 +179,10 @@
        // 校验存在
        MdmItemDO item = validateItemExists(id);
        // 解决软删除唯一键冲突:如果已存在相同 code 且已软删除的记录,先物理删除它
        MdmItemDO existingDeleted = itemMapper.selectByCodeAndDeleted(item.getCode(), true);
        if (existingDeleted != null && !existingDeleted.getId().equals(id)) {
            itemMapper.physicalDeleteById(existingDeleted.getId());
        }
//        MdmItemDO existingDeleted = itemMapper.selectByCodeAndDeleted(item.getCode(), true);
//        if (existingDeleted != null && !existingDeleted.getId().equals(id)) {
//            itemMapper.physicalDeleteById(existingDeleted.getId());
//        }
        // 软删除当前记录
        itemMapper.deleteById(id);
    }