提交 6344f417 编写于 作者: sq3536's avatar sq3536

repair

上级 da91207b
......@@ -198,7 +198,9 @@ TARGET=PSWFVERSION
<#assign LinkCond="">
<#assign strGroupCond="">
<#if WFLink.getWFLinkType()=='ROUTE'>
<#if WFLink.getPSWFLinkGroupCond?? && WFLink.getPSWFLinkGroupCond()??>
<#if WFLink.getCustomCond?? && WFLink.getCustomCond()??>
<#assign LinkCond=WFLink.getCustomCond()>
<#elseif WFLink.getPSWFLinkGroupCond?? && WFLink.getPSWFLinkGroupCond()??>
<#assign WFLinkCond=WFLink.getPSWFLinkGroupCond()>
<#assign strGroupCond=getGroupCond(WFLinkCond)>
<#assign strGroupCond="$\{"+strGroupCond+"} ">
......@@ -207,8 +209,10 @@ TARGET=PSWFVERSION
<#else>
<#assign LinkCond="<![CDATA[$\{sequenceFlowId==\""+flowId+"\"}]]>">
</#if>
<#if LinkCond!="">
<conditionExpression xsi:type="tFormalExpression" >${LinkCond}</conditionExpression>
</#if>
</#if>
</sequenceFlow>
</#list>
</#if>
......@@ -279,11 +283,15 @@ 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","<") >
<#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=targetField+" "+strTargetDBValueOP>
<#assign condBody="activedata."+targetField+" "+strTargetDBValueOP>
<#elseif paramType??&&paramType=='ENTITYFIELD'>
<#assign condBody="activedata."+targetField+" "+strTargetDBValueOP+" activedata."+targetValue?lower_case >
<#elseif paramType??&&paramType=='CURTIME'>
<#assign condBody="activedata."+targetField+" "+strTargetDBValueOP+" wfCoreService.getnow()" >
<#else>
<#assign condBody=targetField+" "+strTargetDBValueOP+" \""+targetValue+"\"" >
<#assign condBody="activedata."+targetField+" "+strTargetDBValueOP+" "+targetValue?replace("\"","'")?replace("‘","'")?replace("“","'")?replace("”","'") >
</#if>
</#if>
<#assign fieldCond=fieldCond+condBody >
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册