diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java index abc505d..4e1dce6 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/HttpUtils.java @@ -21,4 +21,12 @@ public class HttpUtils { */ return userAgent.contains("iOS"); } + + public static boolean phoneType(HttpServletRequest request){ + String userAgent = request.getHeader("type"); + if ("1".equals(userAgent)){ + return false; + } + return true; + } } diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java index 2da96bb..d73b81a 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/impl/AppMenuServiceImpl.java @@ -49,8 +49,8 @@ public class AppMenuServiceImpl extends ServiceImpl impl @Override public List> getHomeMenu(HttpServletRequest request) { // 1、安卓; 2、iOS - int clientType = HttpUtils.isIOS(request)? 2: 1; - + //int clientType = HttpUtils.isIOS(request)? 2: 1; + int clientType = HttpUtils.phoneType(request)?2:1; final String demoFlag = request.getHeader("demo"); List> result = new ArrayList<>(); @@ -66,8 +66,18 @@ public class AppMenuServiceImpl extends ServiceImpl impl appMenuList = baseMapper.getByNavCode(dict.getId(),userType, clientType); } + //根据版本号 + String version = request.getHeader("version"); + Map map = null; for (AppMenu appMenu : appMenuList) { + if (StringUtils.isNotBlank(version)){ + if ("119".equals(version) && clientType==2){ + if (appMenu.getId()==62 || appMenu.getId()==18){ + break; + } + } + } AppMenu.wrapper(appMenu); menuPathConvert(appMenu, request); if (map == null || !map.get("type").equals(appMenu.getMenuGroupDesc())) {