工作流角色调整

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

@@ -11,13 +11,14 @@ TARGET=PSWFVERSION
         <extensionElements>
             <flowable:eventListener delegateExpression="${r'${processInstanceListener}'}"  />
             <#if item.getPSWFProcesses?? && item.getPSWFProcesses()??>
+                <#assign rolesList="">
                 <#list item.getPSWFProcesses() as WFProcess>
                     <#if WFProcess.getPSWFProcessRoles?? && WFProcess.getPSWFProcessRoles()??>
-                            <#assign rolesList="">
                         <#list WFProcess.getPSWFProcessRoles() as processRole>
                             <#assign processRoleType=processRole.getWFProcessRoleType()>
                             <#if processRoleType=='WFROLE'>
                                <#if processRole.getPSWFRole()?? && processRole.getPSWFRole().getCodeName()??>
+                                    <#if !P.exists("refgroups",processRole.getPSWFRole().getCodeName())>
                                         <#if rolesList!=""><#assign rolesList=rolesList+","></#if>
                                         <#assign rolesList=rolesList+processRole.getPSWFRole().getCodeName()+"|"+processRole.getPSWFRole().getName()+"|"+processRole.getPSWFRole().getWFRoleType()>
                                         <#if processRole.getPSWFRole().getWFRoleType()=="DEDATASET">
@@ -25,6 +26,9 @@ TARGET=PSWFVERSION
                                         </#if>
                                     </#if>
                                </#if>
+                            </#if>
+                        </#list>
+                    </#if>
                 </#list>
                 <#if rolesList!="">
             <flowable:field name="refgroups">
@@ -32,8 +36,6 @@ TARGET=PSWFVERSION
             </flowable:field>
                 </#if>
             </#if>
-                </#list>
-            </#if>
             <#if item.getPSWorkflow()?? && item.getPSWorkflow().getPSWFDEs()??>
             <#assign des="">
             <#list item.getPSWorkflow().getPSWFDEs() as wfde>