修复conn

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

@@ -127,7 +127,6 @@ TARGET=PSDELOGIC
 <#function getGroupCond LogicLinkCond>
     <#assign strRuleCond="(">
     <#if LogicLinkCond.getPSDELogicLinkConds?? && LogicLinkCond.getPSDELogicLinkConds()??><#comment>判断是否有组条件</#comment>
-        <#assign conn=LogicLinkCond.getGroupOP()?replace("AND","&&")?replace("OR","||")>
         <#list LogicLinkCond.getPSDELogicLinkConds() as childLogicLinkCond><#comment>组条件，递归</#comment>
             <#if childLogicLinkCond.getPSDELogicLinkConds?? && childLogicLinkCond.getPSDELogicLinkConds()??>
                 <#assign strRuleCond=strRuleCond+getGroupCond(childLogicLinkCond)>//getGroupCond
@@ -135,7 +134,7 @@ TARGET=PSDELOGIC
                 <#assign strRuleCond=strRuleCond+getFieldCond(childLogicLinkCond)>//getFieldCond
             </#if>
             <#if childLogicLinkCond_has_next>
-                <#assign strRuleCond=strRuleCond+conn>//拼接连接符
+                <#assign strRuleCond=strRuleCond+LogicLinkCond.getGroupOP()?replace("AND","&&")?replace("OR","||")>//拼接连接符
             </#if>
         </#list>
     </#if>