diff --git a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java index 6c93ddb..50997ab 100644 --- a/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java +++ b/axzo-auth-spring-boot-starter/src/main/java/cn/axzo/framework/auth/domain/TerminalInfo.java @@ -457,11 +457,20 @@ public class TerminalInfo { public boolean isCMP_APP_ENT_ZB() { return NT_CMP_APP_ENT_ZB.equals(newTerminalString); } + public boolean isCMP_APP_ENT_ZB(Integer workspaceType) { + return NT_CMP_APP_ENT_ZB.equals(newTerminalString) + || (NT_CMP_APP_GENERAL.equals(newTerminalString) && workspaceType == 1); + } public boolean isCMP_APP_PROJ() { return NT_CMP_APP_PROJ.equals(newTerminalString); } + public boolean isCMP_APP_PROJ(Integer workspaceType) { + return NT_CMP_APP_PROJ.equals(newTerminalString) + || (NT_CMP_APP_GENERAL.equals(newTerminalString) && workspaceType == 2); + } + public boolean isCM_APP_CM_LEADER() { return NT_CM_APP_CM_LEADER.equals(newTerminalString); }