Skip to content

Commit 1287959

Browse files
committed
处理子包路径为空.
#6994
1 parent 7d1ce24 commit 1287959

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

mybatis-plus-generator/src/main/java/com/baomidou/mybatisplus/generator/config/PackageConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public String getParent() {
117117
@NotNull
118118
public String joinPackage(String subPackage) {
119119
String parent = getParent();
120-
return StringUtils.isBlank(parent) ? subPackage : (parent + StringPool.DOT + subPackage);
120+
return StringUtils.isBlank(parent) ? subPackage : (parent + (StringUtils.isBlank(subPackage) ? StringPool.EMPTY : StringPool.DOT + subPackage));
121121
}
122122

123123
/**

mybatis-plus-generator/src/test/java/com/baomidou/mybatisplus/generator/config/PackageConfigTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ void joinPackageTest() {
1919
Assertions.assertEquals("com.baomidou.mp.demo", GeneratorBuilder.packageConfigBuilder().moduleName("mp").joinPackage("demo"));
2020
Assertions.assertEquals("com.baomihua.demo", GeneratorBuilder.packageConfigBuilder().parent("com.baomihua").joinPackage("demo"));
2121
Assertions.assertEquals("com.baomihua.mp.demo", GeneratorBuilder.packageConfigBuilder().parent("com.baomihua").moduleName("mp").joinPackage("demo"));
22+
Assertions.assertEquals("com.baomihua.mp", GeneratorBuilder.packageConfigBuilder().parent("com.baomihua").moduleName("mp").joinPackage(null));
23+
Assertions.assertEquals("com.baomihua.mp", GeneratorBuilder.packageConfigBuilder().parent("com.baomihua").moduleName("mp").joinPackage(""));
2224
}
2325

2426
private void buildAssert(PackageConfig packageConfig){

0 commit comments

Comments
 (0)