From a302fcd963cd5b428d1e124c42fd964d78863f32 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Sat, 8 Apr 2023 17:30:47 +0800
Subject: [PATCH] =?UTF-8?q?[issue/4649]=E6=A0=91=E5=BC=80=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E7=9A=84=E5=AD=97=E6=AE=B5=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E5=B8=A6=E7=9D=80=E4=B8=8B=E5=88=92=E7=BA=BF=E4=BC=9A=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=94=9F=E6=88=90=E7=9A=84=20*mapper.xml=20=E4=B8=AD?=
 =?UTF-8?q?=20SQL=E8=AF=AD=E5=8F=A5=E5=87=BA=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/${entityName}Mapper.xml                 | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
index f224e0bf..d61443b6 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
@@ -1,6 +1,8 @@
 <#assign hasChildrenField = "">
 <#assign pidFieldName = "">
 <#assign textFieldName = "">
+<#assign textDbFieldName = "">
+<#assign pidDbFieldName = "">
 <#list originalColumns as po>
   <#if po.fieldDbName == tableVo.extendParams.hasChildren>
     <#assign hasChildrenField = po.fieldName>
@@ -8,9 +10,11 @@
   <#-- begin 【vue3专用】 -->
   <#if po.fieldDbName == tableVo.extendParams.pidField>
     <#assign pidFieldName = po.fieldName>
+    <#assign pidDbFieldName = po.fieldDbName>
   </#if>
   <#if po.fieldDbName == tableVo.extendParams.textField>
     <#assign textFieldName = po.fieldName>
+    <#assign textDbFieldName = po.fieldDbName>
   </#if>
   <#-- end 【vue3专用】 -->
 </#list>
@@ -26,11 +30,11 @@
 	<select id="queryListByPid" parameterType="java.lang.Object" resultType="org.jeecg.common.system.vo.SelectTreeModel">
 		select
 		  id as "key",
-		  ${textFieldName} as "title",
+		  ${textDbFieldName} as "title",
 		  (case when ${Format.humpToUnderline(hasChildrenField)} = '1' then 0 else 1 end) as isLeaf,
-		  ${pidFieldName} as parentId
+		  ${pidDbFieldName} as parentId
 		from ${tableName}
-		where ${pidFieldName} = ${r'#'}{pid}
+		where ${pidDbFieldName} = ${r'#'}{pid}
 		<if test="query != null">
 			<foreach collection="query.entrySet()" item="value" index="key">
 				and ${r'$'}{key} = ${r'#'}{value}