工作流角色调整

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

@@ -11,28 +11,30 @@ 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()??>
+                        <#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">
-                                        <#assign rolesList=rolesList+"/"+srfpluralize(processRole.getPSWFRole().getPSDataEntity().getCodeName()?lower_case)+"/fetch"+processRole.getPSWFRole().getPSDEDataSet().getCodeName()?lower_case+"."+processRole.getPSWFRole().getWFUserIdPSDEF().getCodeName()?lower_case>
+                                            <#assign rolesList=rolesList+"/"+srfpluralize(processRole.getPSWFRole().getPSDataEntity().getCodeName()?lower_case)+"/fetch"+processRole.getPSWFRole().getPSDEDataSet().getCodeName()?lower_case+"."+processRole.getPSWFRole().getWFUserIdPSDEF().getCodeName()?lower_case>
                                         </#if>
-                                   </#if>
-                                </#if>
-                            </#list>
-                            <#if rolesList!="">
-            <flowable:field name="refgroups">
-                <flowable:string>${rolesList}</flowable:string>
-            </flowable:field>
+                                    </#if>
+                               </#if>
                             </#if>
+                        </#list>
                     </#if>
                 </#list>
+                <#if rolesList!="">
+            <flowable:field name="refgroups">
+                <flowable:string>${rolesList}</flowable:string>
+            </flowable:field>
+                </#if>
             </#if>
             <#if item.getPSWorkflow()?? && item.getPSWorkflow().getPSWFDEs()??>
             <#assign des="">