From fba7d195db1a788a978e934bf6799ed3b9039483 Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 22 Aug 2022 02:41:54 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/develop/controller/CodeController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java index e9c6abeb..b6a2e79a 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/develop/controller/CodeController.java @@ -30,6 +30,7 @@ import org.springblade.core.tool.constant.RoleConstant; import org.springblade.core.tool.jackson.JsonUtil; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.StringUtil; +import org.springblade.develop.constant.DevelopConstant; import org.springblade.develop.entity.Code; import org.springblade.develop.entity.Datasource; import org.springblade.develop.entity.Model; @@ -144,7 +145,7 @@ public class CodeController extends BladeController { List prototypes = modelPrototypeService.prototypeList(model.getId()); generator.setModel(JsonUtil.readMap(JsonUtil.toJson(model))); generator.setPrototypes(JsonUtil.readListMap(JsonUtil.toJson(prototypes))); - if (StringUtil.isNotBlank(code.getSubModelId())) { + if (StringUtil.isNotBlank(code.getSubModelId()) && StringUtil.equals(code.getTemplateType(), DevelopConstant.TEMPLATE_SUB)) { Model subModel = modelService.getById(Func.toLong(code.getSubModelId())); List subPrototypes = modelPrototypeService.prototypeList(subModel.getId()); generator.setSubModel(JsonUtil.readMap(JsonUtil.toJson(subModel)));