From 6687efd887672a80db996d186922868888c67139 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 24 二月 2020 09:56:22 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
index 58bcf41..d24014b 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/tool/gen/domain/GenTable.java
@@ -3,6 +3,7 @@
import java.util.List;
import javax.validation.Valid;
import javax.validation.constraints.NotBlank;
+import org.apache.commons.lang3.ArrayUtils;
import com.ruoyi.common.constant.GenConstants;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.domain.BaseEntity;
@@ -262,7 +263,8 @@
{
if (isTree(tplCategory))
{
- StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.TREE_ENTITY);
+ return StringUtils.equalsAnyIgnoreCase(javaField,
+ ArrayUtils.addAll(GenConstants.TREE_ENTITY, GenConstants.BASE_ENTITY));
}
return StringUtils.equalsAnyIgnoreCase(javaField, GenConstants.BASE_ENTITY);
}
--
Gitblit v1.9.3