Big-Data-Lab
/
CET-cmd-2.0
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

[issue/4649]树开表单列的字段如果带着下划线会导致生成的 *mapper.xml 中 SQL语句出错

This commit is contained in:
zhangdaiscott 2023-04-08 17:30:47 +08:00
parent 5258228d3b
commit a302fcd963
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jeecg-module-system/jeecg-system-biz/src/main/resources/jeecg/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/mapper/xml/${entityName}Mapper.xml
View File

@ -1,6 +1,8 @@
<#assign hasChildrenField = ""> <#assign hasChildrenField = "">
<#assign pidFieldName = ""> <#assign pidFieldName = "">
<#assign textFieldName = ""> <#assign textFieldName = "">
<#assign textDbFieldName = "">
<#assign pidDbFieldName = "">
<#list originalColumns as po> <#list originalColumns as po>
<#if po.fieldDbName == tableVo.extendParams.hasChildren> <#if po.fieldDbName == tableVo.extendParams.hasChildren>
<#assign hasChildrenField = po.fieldName> <#assign hasChildrenField = po.fieldName>
@ -8,9 +10,11 @@
<#-- begin 【vue3专用】 --> <#-- begin 【vue3专用】 -->
<#if po.fieldDbName == tableVo.extendParams.pidField> <#if po.fieldDbName == tableVo.extendParams.pidField>
<#assign pidFieldName = po.fieldName> <#assign pidFieldName = po.fieldName>
<#assign pidDbFieldName = po.fieldDbName>
</#if> </#if>
<#if po.fieldDbName == tableVo.extendParams.textField> <#if po.fieldDbName == tableVo.extendParams.textField>
<#assign textFieldName = po.fieldName> <#assign textFieldName = po.fieldName>
<#assign textDbFieldName = po.fieldDbName>
</#if> </#if>
<#-- end 【vue3专用】 --> <#-- end 【vue3专用】 -->
</#list> </#list>
@ -26,11 +30,11 @@
<select id="queryListByPid" parameterType="java.lang.Object" resultType="org.jeecg.common.system.vo.SelectTreeModel"> <select id="queryListByPid" parameterType="java.lang.Object" resultType="org.jeecg.common.system.vo.SelectTreeModel">
select select
id as "key", id as "key",
${textFieldName} as "title", ${textDbFieldName} as "title",
(case when ${Format.humpToUnderline(hasChildrenField)} = '1' then 0 else 1 end) as isLeaf, (case when ${Format.humpToUnderline(hasChildrenField)} = '1' then 0 else 1 end) as isLeaf,
${pidFieldName} as parentId ${pidDbFieldName} as parentId
from ${tableName} from ${tableName}
where ${pidFieldName} = ${r'#'}{pid} where ${pidDbFieldName} = ${r'#'}{pid}
<if test="query != null"> <if test="query != null">
<foreach collection="query.entrySet()" item="value" index="key"> <foreach collection="query.entrySet()" item="value" index="key">
and ${r'$'}{key} = ${r'#'}{value} and ${r'$'}{key} = ${r'#'}{value}