diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java index 43a267bd..287dc19b 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionQueryServiceImpl.java @@ -178,12 +178,21 @@ public class PermissionQueryServiceImpl implements PermissionQueryService { return navTreeList.stream().filter(t -> Objects.equals(t.getParentId(), root.getId())).collect(Collectors.toList()); } + private boolean isGATerminal(String terminal) { + if (Objects.isNull(terminal)) { + return false; + } + + TerminalInfo tm = new TerminalInfo(terminal); + return tm.isGA(); + } + @Override public boolean hasPermission(PermissionCheckReq req) { //这里暂时硬编码-非OMS端鉴权请求 直接转老接口处理 if (!StrUtil.equals("NT_OMS_WEB" ,req.getTerminal()) - && !Objects.equals(TerminalInfo.NT_PC_GA_GENERAL, req.getTerminal())) { + && !isGATerminal(req.getTerminal())) { if (USE_OLD_AUTH) { log.info("user old auth"); return hasPermissionV2(req);