查询模型上下文参数支持格式：${srfdatacontext('cityid')}

SLN/%PUBPRJ%-core/src/main/resources/mapper/%MOD_PKGPATH%/%DE_PKGPATH%/${de.codeName}Mapper.xml.ftl

@@ -196,13 +196,22 @@ TARGET=PSDATAENTITY
 <#comment>第二次替换：#{srf.datacontext.field}</#comment>
 <#comment>第三次替换: #{srf.datacontext.ORGID} --> #{srf.datacontext.orgid} </#comment>
 <#function contextParamConvert contextParam>
-	<#assign resultParam="">
-	<#assign resultParam=contextParam?replace('$\{srfdatacontext(\'','#\{srf.datacontext.')?replace("','\\{[\\S]*}'\\)}","\\}","r")><#comment>数据上下文</#comment>
-	<#assign resultParam=resultParam?replace('$\{srfsessioncontext(\'','#\{srf.sessioncontext.')?replace("','\\{[\\S]*}'\\)}","\\}","r")><#comment>用户上下文</#comment>
-	<#assign resultParam=resultParam?replace('$\{srfwebcontext(\'','#\{srf.webcontext.')?replace("','\\{[\\S]*}'\\)}","\\}","r")><#comment>网页请求上下文</#comment>
-	<#assign params=resultParam?matches('#\\{srf.[\\S]*}')>
+	<#comment>平台配置格式替换${srfdatacontext('cityid','{"defname":"CITYID","dename":"CITY"}')}  --> #{srf.srfdatacontext.cityid}   </#comment>
+	<#assign contextParam=contextParam?replace("\\$\\{(srfdatacontext|srfsessioncontext|srfwebcontext)\\('(\\w+)','(.*)'\\)}","#\{srf.$1.$2}","r")>
+	<#comment>用户配置格式替换${srfdatacontext('cityid')}  --> #{srf.srfdatacontext.cityid}   </#comment>
+	<#assign contextParam=contextParam?replace("\\$\\{(srfdatacontext|srfsessioncontext|srfwebcontext)\\('(\\w+)'\\)}","#\{srf.$1.$2}","r")>
+	<#comment>将上下文参数转小写 #{srf.srfdatacontext.SRFORGID} --> #{srf.srfdatacontext.srforgid}</#comment>
+	<#assign params=contextParam?matches('#\\{srf.[\\S]*}')>
 	<#list params as param>
-		<#assign resultParam=resultParam?replace(param,param?lower_case)><#comment>将上下文参数转小写</#comment>
-	</#list>
-	<#return resultParam>
+		<#assign contextParam=contextParam?replace(param,param?lower_case)>
+	</#list>
+	<#--<#assign resultParam="">-->
+	<#--<#assign resultParam=contextParam?replace('$\{srfdatacontext(\'','#\{srf.datacontext.')?replace("','\\{[\\S]*}'\\)}","\\}","r")><#comment>数据上下文</#comment>-->
+	<#--<#assign resultParam=resultParam?replace('$\{srfsessioncontext(\'','#\{srf.sessioncontext.')?replace("','\\{[\\S]*}'\\)}","\\}","r")><#comment>用户上下文</#comment>-->
+	<#--<#assign resultParam=resultParam?replace('$\{srfwebcontext(\'','#\{srf.webcontext.')?replace("','\\{[\\S]*}'\\)}","\\}","r")><#comment>网页请求上下文</#comment>-->
+	<#--<#assign params=resultParam?matches('#\\{srf.[\\S]*}')>-->
+	<#--<#list params as param>-->
+		<#--<#assign resultParam=resultParam?replace(param,param?lower_case)><#comment>将上下文参数转小写</#comment>-->
+	<#--</#list>-->
+	<#return contextParam>
 </#function>