From 62a3606169b91d5967303f02d0b46acc3b9e0f1b Mon Sep 17 00:00:00 2001 From: TinyAnts Date: Thu, 29 Dec 2022 14:16:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=85=B3=E8=81=94=E8=A1=A8=E5=89=8D=E7=BC=80=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mdd/generator/service/impl/GenerateServiceImpl.java | 2 +- .../src/main/java/com/mdd/generator/util/VelocityUtil.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java index f14e999c..430c033d 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java +++ b/server/like-generator/src/main/java/com/mdd/generator/service/impl/GenerateServiceImpl.java @@ -264,7 +264,7 @@ public class GenerateServiceImpl implements IGenerateService { model.setGenType(genParam.getGenType()); model.setGenPath(genParam.getGenPath()); model.setSubTableFk(genParam.getSubTableFk()); - model.setSubTableName(genParam.getSubTableName().replace(GlobalConfig.tablePrefix, "")); + model.setSubTableName(genParam.getSubTableName()); genTableMapper.updateById(model); for (Map item : genParam.getColumn()) { diff --git a/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java b/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java index 4803268b..687a38b7 100644 --- a/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java +++ b/server/like-generator/src/main/java/com/mdd/generator/util/VelocityUtil.java @@ -1,5 +1,6 @@ package com.mdd.generator.util; +import com.mdd.common.config.GlobalConfig; import com.mdd.common.util.StringUtils; import com.mdd.generator.config.GenConfig; import com.mdd.generator.constant.GenConstants; @@ -67,6 +68,9 @@ public class VelocityUtil { } } + // 替换前缀 + table.setSubTableName(table.getSubTableName().replace(GlobalConfig.tablePrefix, "")); + // 设置模板变量 VelocityContext velocityContext = new VelocityContext(); velocityContext.put("genTpl", table.getGenTpl());