test

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

@@ -129,14 +129,13 @@ 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+childConn>//拼接连接符
+                <#assign strRuleCond=strRuleCond+conn+LogicLinkCond.getName()+LogicLinkCond.getType()>//拼接连接符
             </#if>
         </#list>
     </#if>