补充用户上下文in查询

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

@@ -204,7 +204,7 @@ TARGET=PSDATAENTITY
 
 <#comment>数据查询context条件转换</#comment>
 <#function contextParamConvert contextParam>
-	<#comment>补充 IN上下级条件查询 IN (${srfdatacontext('cityid','{"defname":"CITYID","dename":"CITY"}')}) -->IN ( ${srf.srfdatacontext.cityid} )  </#comment>
+	<#comment>补充上下文的IN查询(in通过$获取参数,其余为#)： IN (${srfdatacontext('cityid','{"defname":"CITYID","dename":"CITY"}')}) -->IN ( ${srf.srfdatacontext.cityid} )  </#comment>
 	<#assign resultParam=contextParam?replace("(IN|in) \\(\\$\\{srf(datacontext|sessioncontext|webcontext)\\('(\\w+)','(.*?)'\\)}\\)","$1 (\\$\{srf.$2.$3})","r")>
 	<#comment>平台配置格式替换${srfdatacontext('cityid','{"defname":"CITYID","dename":"CITY"}')}  --> #{srf.srfdatacontext.cityid}   </#comment>
 	<#assign resultParam=resultParam?replace("\\$\\{srf(datacontext|sessioncontext|webcontext)\\('(\\w+)','(.*?)'\\)}","#\{srf.$1.$2}","r")>
@@ -215,14 +215,6 @@ TARGET=PSDATAENTITY
 	<#list params as param>
 		<#assign resultParam=resultParam?replace(param,param?lower_case,'i')>
 	</#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 resultParam>
 </#function>
 
@@ -230,8 +222,10 @@ TARGET=PSDATAENTITY
 <#function checkNullContextParamConvert contextParam>
 	<#comment>获取数据查询中的条件，并对条件进行转义 <![CDATA[ age <='20' ]]></#comment>
 	<#assign resultParam=contextParam?replace("(\\s+[\\w|\\.|\\`]+\\s*?)(<>|<=|<|>=|>)(\\s*[\\w|\\'|$\{}()'\",:\\\\]+\\s+?)"," <![CDATA[ $1$2$3 ]]> ","r")>
+	<#comment>补充上下文的IN查询(in通过$获取参数,其余为#)</#comment>
+	<#assign resultParam=resultParam?replace("<#assign _value=srf(datacontext|sessioncontext|webcontext)\\('(\\w+)','(.*?)'\\)><#if _value\\?length gt 0>(.*?)\\(\\$\\{_value}\\)<#else>1=1</#if>","<choose><when test=\"srf.$1.$2 != null\"> <![CDATA[ $4  \\$\{srf.$1.$2}  ]]> </when><otherwise>1=1</otherwise></choose>","r")>
 	<#comment>获取模型中的空值条件，在条件外层补充mybatis判断条件 <choose><when test="srf.datacontext.name != null"> <![CDATA[ t1.`NAME` <= #{srf.datacontext.name}  ]]> </when><otherwise>1=1</otherwise></choose>  </#comment>
-	<#assign resultParam=resultParam?replace("<#assign _value=srf(datacontext|sessioncontext|webcontext)\\('(\\w+)','(.*?)'\\)><#if _value\\?length gt 0>(.*?)=(.*?)<#else>1=1</#if>","<choose><when test=\"srf.$1.$2 != null\"> <![CDATA[ $4= #\{srf.$1.$2}  ]]> </when><otherwise>1=1</otherwise></choose>","r")>
+	<#assign resultParam=resultParam?replace("<#assign _value=srf(datacontext|sessioncontext|webcontext)\\('(\\w+)','(.*?)'\\)><#if _value\\?length gt 0>(.*?)\\$\\{_value}.*?<#else>1=1</#if>","<choose><when test=\"srf.$1.$2 != null\"> <![CDATA[ $4  #\{srf.$1.$2}  ]]> </when><otherwise>1=1</otherwise></choose>","r")>
 	<#comment>对数据查询中的其余条件的context进行解析</#comment>
 	<#assign resultParam=contextParamConvert(resultParam)>
 	<#return resultParam>
@@ -241,7 +235,7 @@ TARGET=PSDATAENTITY
 <#function checkIgnoreNullvalueCond dataQueryCode>
 	<#if dataQueryCode.getPSDEDataQueryCodeConds()??>
 		<#list dataQueryCode.getPSDEDataQueryCodeConds() as dedqfieldcond>
-			<#if srfjavasqlcode(dedqfieldcond.getCustomCond())?matches("(.*?)srfdatacontext(.*?)\\\\\"ignoreempty\\\\\":true(.*?)")>
+			<#if srfjavasqlcode(dedqfieldcond.getCustomCond())?matches("(.*?)srf(datacontext|sessioncontext|webcontext)(.*?)\\\\\"ignoreempty\\\\\":true(.*?)")>
 				<#return true>
 			</#if>
 		</#list>