express

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

@@ -284,12 +284,22 @@ TARGET=PSWFVERSION
     <#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 paramType??&&paramType=='ENTITYFIELD'>
+            <#if targetDBValueOP=="ISNULL" || targetDBValueOP=="ISNOTNULL">
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' null)" >
+            <#elseif paramType??&&paramType=='ENTITYFIELD'>
+                <#if targetValue??&&targetValue!="">
                 <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' activedata."+targetValue?lower_case+")" >
+                <#else>
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' null)" >
+                </#if>
             <#elseif paramType??&&paramType=='CURTIME'>
                 <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' wfCoreService.getnow())" >
             <#else>
+                <#if targetValue??&&targetValue!="">
                 <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' '"+targetValue?replace("\"","")?replace("‘","")?replace("“","")?replace("”","")+"')" >
+                <#else>
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' null)" >
+                </#if>
             </#if>
     </#if>
     <#assign fieldCond=fieldCond+condBody >