From b6ea3b1f7fa9a2f783deae7399a8e2d81f1d72f2 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Thu, 15 Jun 2023 23:05:41 +0800
Subject: [PATCH] =?UTF-8?q?tree=E8=A1=A8=E7=9A=84parentCode=E4=B9=9F?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81bigint=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/src/main/resources/templates/modules/gen/config.xml | 2 +-
 .../src/main/resources/templates/modules/gen/crud/entity.xml | 5 +++++
 .../resources/templates/modules/gen/crud_cloud/entity.xml    | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/config.xml b/modules/core/src/main/resources/templates/modules/gen/config.xml
index 4865edd4..b5f00fab 100644
--- a/modules/core/src/main/resources/templates/modules/gen/config.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/config.xml
@@ -135,7 +135,7 @@
 		<dict value="java.util.Date" label="Date"/>
 		<dict value="com.jeesite.modules.sys.entity.User" label="User"/>
 		<dict value="com.jeesite.modules.sys.entity.Office" label="Office"/>
-		<dict value="This" label="This" description="生成当前对象"/>
+		<dict value="Parent" label="Parent" description="生成父对象"/>
 	</attrType>
 	<!-- 查询类型 -->
 	<queryType>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
index 652017e3..4e92b2f5 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
@@ -64,6 +64,11 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 				}
 			// ● 如果是TreeEntity类属性
 			}else if(table.isTreeEntity && c.isTreeEntityColumn){
+				if(c.columnName == 'parent_code'){
+		%>
+		@Column(name="${c.columnName}", attrName="${c.attrName}", label="${c.columnLabel}", isParentCode=true),
+		<%
+				}
 				if(!isTree){
 					isTree = true;
 		%>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
index 6f04226f..45d81b0b 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
@@ -64,6 +64,11 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields;
 				}
 			// ● 如果是TreeEntity类属性
 			}else if(table.isTreeEntity && c.isTreeEntityColumn){
+				if(c.columnName == 'parent_code'){
+		%>
+		@Column(name="${c.columnName}", attrName="${c.attrName}", label="${c.columnLabel}", isParentCode=true),
+		<%
+				}
 				if(!isTree){
 					isTree = true;
 		%>