From f6de03a009fc1f2d8755f33882b259f3c54d531a Mon Sep 17 00:00:00 2001
From: abbfun <819589789@qq.com>
Date: 星期五, 19 六月 2020 10:00:41 +0800
Subject: [PATCH] update ruoyi-ui/src/views/monitor/job/log.vue. data对象中属性【表单参数form】重复
---
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 d608c82..039af5e 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.2