test

SLN/%PUBPRJ%-core/src/main/resources/rules/%DE%%ITEM%RuleFlow.bpmn.ftl

@@ -91,9 +91,7 @@ TARGET=PSDELOGIC
             eval(${strExpCond});<#comment>在fact中寻找与global中对应参数</#comment>
                 </#if>
             <#assign LogicLinkCond=LogicLink.getPSDELogicLinkGroupCond()>
-            <#list LogicLinkCond.getPSDELogicLinkConds() as childLogicLinkCond>
-                <#assign strGroupCond=getGroupCond(childLogicLinkCond)>
-            </#list>
+            <#assign strGroupCond=getGroupCond(LogicLinkCond)>
                 eval${strGroupCond}
                 ]]>
             </conditionExpression>
@@ -131,13 +129,14 @@ TARGET=PSDELOGIC
     <#if LogicLinkCond.getPSDELogicLinkConds?? && LogicLinkCond.getPSDELogicLinkConds()??><#comment>判断是否有组条件</#comment>
         <#assign conn=LogicLinkCond.getGroupOP()?replace("AND","&&")?replace("OR","||")>
         <#list LogicLinkCond.getPSDELogicLinkConds() as childLogicLinkCond><#comment>组条件，递归</#comment>
+            <#assign childConn=childLogicLinkCond.getGroupOP()?replace("AND","&&")?replace("OR","||")>
             <#if childLogicLinkCond.getPSDELogicLinkConds?? && childLogicLinkCond.getPSDELogicLinkConds()??>
                 <#assign strRuleCond=strRuleCond+getGroupCond(childLogicLinkCond)>//getGroupCond
             <#else>
                 <#assign strRuleCond=strRuleCond+getFieldCond(childLogicLinkCond)>//getFieldCond
             </#if>
             <#if childLogicLinkCond_has_next>
-                <#assign strRuleCond=strRuleCond+conn>//拼接连接符
+                <#assign strRuleCond=strRuleCond+childConn+childLogicLinkCond.getName()>//拼接连接符
             </#if>
         </#list>
     </#if>