From 40c10f4eefc1c235efe1d66ca9a65ae63c29aa66 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 13 Jun 2023 09:21:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=B8=BB?=
 =?UTF-8?q?=E9=94=AE=E6=94=AF=E6=8C=81=E4=B8=BAbigint=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=EF=BC=9B=E6=A0=91=E8=A1=A8=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=A0=91=E6=98=BE=E7=A4=BA=E7=BC=96=E7=A0=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E4=B8=BA=E7=A9=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=AE=BE=E7=BD=AE=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A0=91=E7=BC=96=E7=A0=81=EF=BC=8C=E6=A0=91?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=90=8D=E7=A7=B0=E5=AD=97=E6=AE=B5=E5=BF=85?=
 =?UTF-8?q?=E9=A1=BB=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/modules/gen/crud/controller.xml     | 6 +++++-
 .../main/resources/templates/modules/gen/crud/entity.xml    | 4 ++--
 .../main/resources/templates/modules/gen/crud/vueList.xml   | 2 ++
 .../templates/modules/gen/crud_cloud/controller.xml         | 6 +++++-
 .../resources/templates/modules/gen/crud_cloud/entity.xml   | 4 ++--
 .../templates/modules/gen/include/dataGridScript.html       | 2 +-
 .../templates/modules/gen/include/dataGridSelectScript.html | 2 +-
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
index a550ce66..d95c69c7 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/controller.xml
@@ -11,8 +11,8 @@ package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModul
 <% if (table.isTreeEntity){ %>
 import java.util.Map;
 <% } %>
-<% if (!table.isTreeEntity || toBoolean(table.optionMap['isImportExport'])){ %>
 import java.util.List;
+<% if (!table.isTreeEntity || toBoolean(table.optionMap['isImportExport'])){ %>
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 <% } %>
@@ -345,7 +345,11 @@ public class ${ClassName}Controller extends BaseController {
 			Map<String, Object> map = MapUtils.newHashMap();
 			map.put("id", e.getId());
 			map.put("pId", e.getParentCode());
+			<% if(table.isPkCustom){ %>
 			map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}()));
+			<% }else{ %>
+			map.put("name", e.get${@StringUtils.cap(table.treeViewNameAttrName)}());
+			<% } %>
 			map.put("isParent", !e.getIsTreeLeaf());
 			mapList.add(map);
 		}
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 f915d114..652017e3 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
@@ -190,7 +190,7 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 			}
 		}
 		// 如果不是基类属性
-		else if(!@StringUtils.equalsIgnoreCase(c.columnName, 'id') && !c.isSuperColumn){
+		else if(!@StringUtils.equalsIgnoreCase(c.simpleAttrName, 'id') && !c.isSuperColumn){
 			// 父类对象
 			if(table.parentExists && table.parentTableFkName == c.columnName){
 	%>
@@ -297,7 +297,7 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 	<%
 				}
 		// 如果不是基类属性
-		}else if(!@StringUtils.equalsIgnoreCase(c.columnName, 'id') && !c.isSuperColumn){
+		}else if(!@StringUtils.equalsIgnoreCase(c.simpleAttrName, 'id') && !c.isSuperColumn){
 	%>
 	
 	<%
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
index 27bc5835..0246a81a 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueList.xml
@@ -50,9 +50,11 @@ for(pk in table.pkList){
 }
 if(table.isTreeEntity){
 %>
+	<% if(table.isPkCustom){ %>
         <span class="cursor-pointer" @click="expandCollapse(record)">
           ( {{ record.${table.treeViewCodeAttrName} }} )
         </span>
+    <% } %>
         <a @click="handleForm({ ${idParam} })">
           {{ record.${table.treeViewNameAttrName} }}
         </a>
diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
index 8304a4af..811d02ea 100644
--- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
+++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/controller.xml
@@ -11,8 +11,8 @@ package ${packageName}.${moduleName}.web${isNotEmpty(subModuleName)?'.'+subModul
 <% if (table.isTreeEntity){ %>
 import java.util.Map;
 <% } %>
-<% if (!table.isTreeEntity || toBoolean(table.optionMap['isImportExport'])){ %>
 import java.util.List;
+<% if (!table.isTreeEntity || toBoolean(table.optionMap['isImportExport'])){ %>
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 <% } %>
@@ -345,7 +345,11 @@ public class ${ClassName}Controller extends BaseController {
 			Map<String, Object> map = MapUtils.newHashMap();
 			map.put("id", e.getId());
 			map.put("pId", e.getParentCode());
+			<% if(table.isPkCustom){ %>
 			map.put("name", StringUtils.getTreeNodeName(isShowCode, e.get${@StringUtils.cap(table.treeViewCodeAttrName)}(), e.get${@StringUtils.cap(table.treeViewNameAttrName)}()));
+			<% }else{ %>
+			map.put("name", e.get${@StringUtils.cap(table.treeViewNameAttrName)}());
+			<% } %>
 			map.put("isParent", !e.getIsTreeLeaf());
 			mapList.add(map);
 		}
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 693746b1..6f04226f 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
@@ -190,7 +190,7 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 			}
 		}
 		// 如果不是基类属性
-		else if(!@StringUtils.equalsIgnoreCase(c.columnName, 'id') && !c.isSuperColumn){
+		else if(!@StringUtils.equalsIgnoreCase(c.simpleAttrName, 'id') && !c.isSuperColumn){
 			// 父类对象
 			if(table.parentExists && table.parentTableFkName == c.columnName){
 	%>
@@ -297,7 +297,7 @@ public class ${ClassName} extends ${toBoolean(table.optionMap['isBpmForm'])?(tab
 	<%
 				}
 		// 如果不是基类属性
-		}else if(!@StringUtils.equalsIgnoreCase(c.columnName, 'id') && !c.isSuperColumn){
+		}else if(!@StringUtils.equalsIgnoreCase(c.simpleAttrName, 'id') && !c.isSuperColumn){
 	%>
 	
 	<%
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html
index 642a27ed..b08a3732 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/dataGridScript.html
@@ -19,7 +19,7 @@ $('#dataGrid').dataGrid({
 				if(c.attrName == table.treeViewNameAttrName){
 		%>
 		{header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '( '+row.${table.treeViewCodeAttrName}+' ) '+'<a href="\${ctx}/${urlPrefix}/form?${idParam}" class="btnList" data-title="\${text("${isQueryTpl?'查看':'编辑'}${functionNameSimple}")}">'+(val||row.id)+'</a>';
+			return <% if(table.isPkCustom){ %>'( '+row.${table.treeViewCodeAttrName}+' ) '+<% } %>'<a href="\${ctx}/${urlPrefix}/form?${idParam}" class="btnList" data-title="\${text("${isQueryTpl?'查看':'编辑'}${functionNameSimple}")}">'+(val||row.id)+'</a>';
 		}},
 		<%
 					firstColumn = false;
diff --git a/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html b/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html
index 70e5d900..7c5a42d2 100644
--- a/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html
+++ b/modules/core/src/main/resources/templates/modules/gen/include/dataGridSelectScript.html
@@ -13,7 +13,7 @@ selectNum = 0, dataGrid = $('#dataGrid').dataGrid({
 				if(c.attrName == table.treeViewNameAttrName){
 		%>
 		{header:'\${text("${c.columnLabel}")}', name:'${c.attrName}', index:'a.${c.columnName}', width:250, align:"left", frozen:true, formatter: function(val, obj, row, act){
-			return '( '+row.${table.treeViewCodeAttrName}+' ) '+(val||row.id);
+			return <% if(table.isPkCustom){ %>'( '+row.${table.treeViewCodeAttrName}+' ) '+<% } %>(val||row.id);
 		}},
 		<%
 					firstColumn = false;