修复无值为空bug（包含）

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

@@ -285,7 +285,7 @@ TARGET=PSDATAENTITY
 	<#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>(.*?)\\$\\{_value}.*?<#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}$5  ]]> </when><otherwise>1=1</otherwise></choose>","r")>
 	<#comment>对数据查询中的其余条件的context进行解析</#comment>
 	<#assign resultParam=contextParamConvert(resultParam)>
 	<#return resultParam>