diff --git a/README.md b/README.md
index 5e4c77b..7f48a6e 100644
--- a/README.md
+++ b/README.md
@@ -43,14 +43,14 @@ Ruoyi-Flex是一套全部开源的快速开发平台,使用MIT开源许可协
## Ruoyi-Flex交流群
-如果您看了文档,还有不明事宜,请加群交流:
+如果您看了文档,还入不了门,请扫码支付199元加群寻求帮助:
- 1、普通QQ群: 100956531 |
+ 1、QQ交流群: 100956531 |
[Ruoyi-Flex交流一群] |
- 2、付费微信VIP交流群(需扫码捐助99元后加好友入群): |
+ 2、微信交流群: |
 |
diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
index 43e3092..2616ce6 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-generator/src/main/java/com/ruoyi/generator/util/VelocityUtils.java
@@ -45,7 +45,7 @@ public class VelocityUtils
VelocityContext velocityContext = new VelocityContext();
velocityContext.put("tplCategory", genTable.getTplCategory());
velocityContext.put("tableName", genTable.getTableName());
- velocityContext.put("CapitalTableName", StringUtils.upperCase(genTable.getTableName()));//表名大写:SYS_USER
+ velocityContext.put("CapitalUnderScoreClassName", StringUtils.upperCase(StringUtils.toUnderScoreCase(genTable.getClassName())));//大写的类名下划线:SYS_USER
velocityContext.put("functionName", StringUtils.isNotEmpty(functionName) ? functionName : "【请填写功能名称】");
velocityContext.put("ClassName", genTable.getClassName());
velocityContext.put("className", StringUtils.uncapitalize(genTable.getClassName()));
diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index b46edf6..7fe2d6e 100644
--- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -30,7 +30,7 @@ import ${packageName}.domain.bo.${ClassName}Bo;
import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.service.I${ClassName}Service;
-import static ${packageName}.domain.table.${ClassName}TableDef.${CapitalTableName};
+import static ${packageName}.domain.table.${ClassName}TableDef.${CapitalUnderScoreClassName};
/**
* ${functionName}Service业务层处理
@@ -46,7 +46,7 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
@Override
public QueryWrapper query() {
- return super.query().from(${CapitalTableName});
+ return super.query().from(${CapitalUnderScoreClassName});
}
private QueryWrapper buildQueryWrapper(${ClassName}Bo ${className}Bo) {
@@ -68,12 +68,12 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
#set($condition=${className}+'Bo.get'+$AttrName+'() != null')
#end
if ($condition) {
- queryWrapper.and(${CapitalTableName}.${capitalColumnName}.$mpMethod(${className}Bo.get$AttrName()));
+ queryWrapper.and(${CapitalUnderScoreClassName}.${capitalColumnName}.$mpMethod(${className}Bo.get$AttrName()));
}
#else
Map params = ${className}Bo.getParams();
if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
- queryWrapper.and(${CapitalTableName}.${capitalColumnName}.$mpMethod(params.get("begin$AttrName"), params.get("end$AttrName")));
+ queryWrapper.and(${CapitalUnderScoreClassName}.${capitalColumnName}.$mpMethod(params.get("begin$AttrName"), params.get("end$AttrName")));
}
#end
#end
@@ -92,7 +92,7 @@ public class ${ClassName}ServiceImpl extends BaseServiceImpl<${ClassName}Mapper,
public ${ClassName}Vo selectById(${pkColumn.javaType} ${pkColumn.javaField})
{
#set($CapitalPkColumn=${pkColumn.columnName.toUpperCase()})
- return this.getOneAs(query().where(${CapitalTableName}.${CapitalPkColumn}.eq(${pkColumn.javaField})), ${ClassName}Vo.class);
+ return this.getOneAs(query().where(${CapitalUnderScoreClassName}.${CapitalPkColumn}.eq(${pkColumn.javaField})), ${ClassName}Vo.class);
}
/**