express

SLN/%PUBPRJ%-core/src/main/resources/workflow/%ITEM%.bpmn.ftl

@@ -283,15 +283,13 @@ TARGET=PSWFVERSION
     <#assign targetValue=WFLinkCond.getParamValue()><#comment>值项</#comment>
     <#if targetField??>
             <#assign targetField=targetField?lower_case>
-            <#assign strTargetDBValueOP=targetDBValueOP?replace("ISNOTNULL","!= null")?replace("ISNULL","== null")?replace("AND","&&")?replace("OR","||")?replace("GT&&EQ",">=")?replace("LT&&EQ","<=")?replace("NOTEQ","!=")?replace("EQ","==")?replace("GT",">")?replace("LT","<") >
-            <#if targetDBValueOP=="ISNULL" || targetDBValueOP=="ISNOTNULL">
-                <#assign condBody="activedata."+targetField+" "+strTargetDBValueOP>
-            <#elseif paramType??&&paramType=='ENTITYFIELD'>
-                <#assign condBody="activedata."+targetField+" "+strTargetDBValueOP+" activedata."+targetValue?lower_case >
+            <#--<#assign strTargetDBValueOP=targetDBValueOP?replace("ISNOTNULL","!= null")?replace("ISNULL","== null")?replace("AND","&&")?replace("OR","||")?replace("GT&&EQ",">=")?replace("LT&&EQ","<=")?replace("NOTEQ","!=")?replace("EQ","==")?replace("GT",">")?replace("LT","<") >-->
+            <#if paramType??&&paramType=='ENTITYFIELD'>
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+strTargetDBValueOP+"' activedata."+targetValue?lower_case+")" >
             <#elseif paramType??&&paramType=='CURTIME'>
-                <#assign condBody="activedata."+targetField+" "+strTargetDBValueOP+" wfCoreService.getnow()" >
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+strTargetDBValueOP+"' wfCoreService.getnow())" >
             <#else>
-                <#assign condBody="activedata."+targetField+" "+strTargetDBValueOP+" "+targetValue?replace("\"","'")?replace("‘","'")?replace("“","'")?replace("”","'") >
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+strTargetDBValueOP+"' '"+targetValue?replace("\"","")?replace("‘","")?replace("“","")?replace("”","")+"')" >
             </#if>
     </#if>
     <#assign fieldCond=fieldCond+condBody >