主状态调整

APP/src/uiservice/%DE_PKGPATH%/%DE_PKGPATH%-ui-service-base.ts.ftl

 <#ibiztemplate>
 TARGET=PSAPPDATAENTITY
 </#ibiztemplate>
-<#macro getMainStateOPPrivs mainState>
+<#macro getMainStateOPPrivs mainState dataEntity>
 <#compress>
+<#if dataEntity.getAllPSDEOPPrivs?? && dataEntity.getAllPSDEOPPrivs()??>
 <#if mainState.getPSDEMainStateOPPrivs?? && mainState.getPSDEMainStateOPPrivs()??>
-{<#list mainState.getPSDEMainStateOPPrivs() as mainStateOPPriv>'${mainStateOPPriv.getName()}':<#if mainState.isOPPrivAllowMode()>1<#else>0</#if><#if mainStateOPPriv_has_next>,</#if></#list>}
+{<#list dataEntity.getAllPSDEOPPrivs() as mainStateOPPriv>'${mainStateOPPriv.getName()}':<#list mainState.getPSDEMainStateOPPrivs() as stateOPPriv><#if stateOPPriv.getId() == mainStateOPPriv.getId()><#assign iscurState = true/></#if></#list><#if iscurState><#if mainState.isOPPrivAllowMode()>1<#else>0</#if><#else><#if mainState.isOPPrivAllowMode()>0<#else>1</#if></#if><#assign iscurState = false/><#if mainStateOPPriv_has_next>,</#if></#list>}
+</#if>
 <#else>
 {}
-</#if> 
+</#if>
 </#compress>
 </#macro>
 import { Environment } from '@/environments/environment';
@@ -153,7 +155,7 @@ export default class ${srfclassname('${item.getCodeName()}')}UIServiceBase exten
         <#if item.getPSDataEntity?? && item.getPSDataEntity()?? && item.getPSDataEntity().getAllPSDEMainStates()??>
         <#list item.getPSDataEntity().getAllPSDEMainStates() as demState>
         <#if demState.getMSTag()??>
-        this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',<@getMainStateOPPrivs mainState=demState />);
+        this.allDeMainStateOPPrivsMap.set('${demState.getMSTag()}',<@getMainStateOPPrivs mainState=demState dataEntity=item.getPSDataEntity() />);
         </#if>
         </#list>
         </#if>