更新 ${de.codeName}Mapper.xml.ftl

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

@@ -227,16 +227,28 @@ TARGET=PSDATAENTITY
 		<#if hasIgnoreNullValueCond>
 		<![CDATA[ ${contextParamConvert(srfjavasqlcode(dedqcode.getQueryCode()))} ]]>
 			<#if dedqcode.getPSDEDataQueryCodeConds()??>
+				<#if item.getSaaSMode()==1>
+				<#list dedqcode.getPSDEDataQueryCodeConds() as dedqfieldcond>
+					<#if (dedqfieldcond_index>0)><#if (dedqfieldcond_index==1)> WHERE </#if> <#if (dedqfieldcond_index>1)> AND </#if>${checkNullContextParamConvert(srfjavasqlcode(dedqfieldcond.getCustomCond()))}</#if>
+				</#list>
+				<#else>
 				<#list dedqcode.getPSDEDataQueryCodeConds() as dedqfieldcond>
 					<#if (dedqfieldcond_index==0)> WHERE </#if>	<#if (dedqfieldcond_index>0)> AND </#if>${checkNullContextParamConvert(srfjavasqlcode(dedqfieldcond.getCustomCond()))}
 				</#list>
+				</#if>
 			</#if>
 		<#else>
 		<![CDATA[ ${contextParamConvert(srfjavasqlcode(dedqcode.getQueryCode()))}
 			<#if dedqcode.getPSDEDataQueryCodeConds()??>
+				<#if item.getSaaSMode()==1>
+				<#list dedqcode.getPSDEDataQueryCodeConds() as dedqfieldcond>
+					<#if (dedqfieldcond_index>0)><#if (dedqfieldcond_index==1)> WHERE </#if> <#if (dedqfieldcond_index>1)> AND </#if>${contextParamConvert(srfjavasqlcode(dedqfieldcond.getCustomCond()))}</#if>
+				</#list>
+				<#else>
 				<#list dedqcode.getPSDEDataQueryCodeConds() as dedqfieldcond>
 					<#if (dedqfieldcond_index==0)> WHERE </#if>	<#if (dedqfieldcond_index>0)> AND </#if>${contextParamConvert(srfjavasqlcode(dedqfieldcond.getCustomCond()))}
 				</#list>
+				</#if>
 			</#if>]]>
 		</#if>
     </sql>