express

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

@@ -255,7 +255,7 @@ TARGET=PSWFVERSION
 <#function getGroupCond WFLinkCond>
     <#assign strRuleCond="(">
     <#if WFLinkCond.getPSWFLinkConds()?? && WFLinkCond.getPSWFLinkConds()??><#comment>判断是否有组条件</#comment>
-        <#assign conn=WFLinkCond.getGroupOP()>
+        <#assign conn=WFLinkCond.getGroupOP()?replace("AND","&&")?replace("OR","||")>
         <#list WFLinkCond.getPSWFLinkConds() as childWFLinkCond><#comment>组条件，递归</#comment>
             <#if childWFLinkCond.getPSWFLinkGroupCond?? && childWFLinkCond.getPSWFLinkGroupCond()??>
                 <#assign strRuleCond=strRuleCond+getGroupCond(childWFLinkCond)>//getGroupCond
@@ -285,11 +285,11 @@ TARGET=PSWFVERSION
             <#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'>
-                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+strTargetDBValueOP+"' activedata."+targetValue?lower_case+")" >
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' activedata."+targetValue?lower_case+")" >
             <#elseif paramType??&&paramType=='CURTIME'>
-                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+strTargetDBValueOP+"' wfCoreService.getnow())" >
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' wfCoreService.getnow())" >
             <#else>
-                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+strTargetDBValueOP+"' '"+targetValue?replace("\"","")?replace("‘","")?replace("“","")?replace("”","")+"')" >
+                <#assign condBody="wfCoreService.test(activedata."+targetField+" '"+targetDBValueOP+"' '"+targetValue?replace("\"","")?replace("‘","")?replace("“","")?replace("”","")+"')" >
             </#if>
     </#if>
     <#assign fieldCond=fieldCond+condBody >