From 7bb653673e7c821d32bf076f99e252d6da324bd7 Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 31 Mar 2023 16:57:16 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=88=A0=E9=99=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../develop/service/impl/ModelServiceImpl.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) 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; } }