test

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

@@ -91,7 +91,9 @@ TARGET=PSDELOGIC
             eval(${strExpCond});<#comment>在fact中寻找与global中对应参数</#comment>
                 </#if>
             <#assign LogicLinkCond=LogicLink.getPSDELogicLinkGroupCond()>
-            <#assign strGroupCond=getGroupCond(LogicLinkCond)>
+            <#list LogicLinkCond.getPSDELogicLinkConds() as childLogicLinkCond>
+                <#assign strGroupCond=getGroupCond(childLogicLinkCond)>
+            </#list>
                 eval${strGroupCond}
                 ]]>
             </conditionExpression>
@@ -135,7 +137,7 @@ TARGET=PSDELOGIC
                 <#assign strRuleCond=strRuleCond+getFieldCond(childLogicLinkCond)>//getFieldCond
             </#if>
             <#if childLogicLinkCond_has_next>
-                <#assign strRuleCond=strRuleCond+conn+childLogicLinkCond.getName()>//拼接连接符
+                <#assign strRuleCond=strRuleCond+conn>//拼接连接符
             </#if>
         </#list>
     </#if>