工作流条件

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

@@ -326,7 +326,8 @@ TARGET=PSWFVERSION
     <#if WFLinkCond.getPSWFLinkConds()?? && WFLinkCond.getPSWFLinkConds()??><#comment>判断是否有组条件</#comment>
         <#assign conn=WFLinkCond.getGroupOP()?replace("AND","&&")?replace("OR","||")>
         <#list WFLinkCond.getPSWFLinkConds() as childWFLinkCond><#comment>组条件，递归</#comment>
-            <#if childWFLinkCond.getPSWFLinkGroupCond?? && childWFLinkCond.getPSWFLinkGroupCond()??>
+            <#assign childLinkType = childWFLinkCond.getCondType()>
+            <#if (childWFLinkCond.getPSWFLinkConds?? && childWFLinkCond.getPSWFLinkConds()?? ) || childLinkType=='GROUP'>
                 <#assign strRuleCond=strRuleCond+getGroupCond(childWFLinkCond)>//getGroupCond
             <#else>
                 <#assign strRuleCond=strRuleCond+getFieldCond(childWFLinkCond)>//getFieldCond
@@ -346,7 +347,7 @@ TARGET=PSWFVERSION
 <#function getFieldCond WFLinkCond>
     <#assign fieldCond="(" >
     <#assign condBody="">
-    <#assign paramType=WFLinkCond.getParamType()><#comment>参数类型</#comment>
+    <#assign paramType=((WFLinkCond.getParamType())!'')><#comment>参数类型</#comment>
     <#assign targetField=WFLinkCond.getFieldName()><#comment>目标属性</#comment>
     <#assign targetDBValueOP=WFLinkCond.getCondOP()><#comment>表达式</#comment>
     <#assign targetValue=WFLinkCond.getParamValue()><#comment>值项</#comment>