diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/ModelServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/ModelServiceImpl.java index 7640da4b..dc4bbbae 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/ModelServiceImpl.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/service/impl/ModelServiceImpl.java @@ -49,16 +49,20 @@ public class ModelServiceImpl extends BaseServiceImpl implem public boolean delete(List ids) { boolean modelTemp = this.deleteLogic(ids); if (modelTemp) { - boolean prototypeTemp = modelPrototypeService.remove(Wrappers.lambdaQuery().in(ModelPrototype::getModelId, ids)); - if (!prototypeTemp) { - throw new ServiceException("删除数据模型成功,关联数据原型删除失败"); + if (modelPrototypeService.count(Wrappers.lambdaQuery().in(ModelPrototype::getModelId, ids)) > 0) { + boolean prototypeTemp = modelPrototypeService.remove(Wrappers.lambdaQuery().in(ModelPrototype::getModelId, ids)); + if (!prototypeTemp) { + throw new ServiceException("删除数据模型成功,关联数据原型删除失败"); + } } - boolean codeTemp = codeService.remove(Wrappers.lambdaQuery().in(Code::getModelId, ids)); - if (!codeTemp) { - throw new ServiceException("删除数据模型成功,关联代码生成配置删除失败"); + if (codeService.count(Wrappers.lambdaQuery().in(Code::getModelId, ids)) > 0) { + boolean codeTemp = codeService.remove(Wrappers.lambdaQuery().in(Code::getModelId, ids)); + if (!codeTemp) { + throw new ServiceException("删除数据模型成功,关联代码生成配置删除失败"); + } } } - return false; + return true; } }