From 378fcd50dfd121f55e92ee14b4d9d2751410836e Mon Sep 17 00:00:00 2001
From: liuyingfang <1357764963@qq.com>
Date: Tue, 19 Mar 2024 11:24:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=8F=9C=E5=8D=95119?=
 =?UTF-8?q?=E7=89=88=E6=9C=ACIOS=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8F=91?=
 =?UTF-8?q?=E7=A5=A8=E4=BB=A5=E5=8F=8A=E7=BA=BF=E4=B8=8A=E5=BA=97=E9=93=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/pluss/platform/util/HttpUtils.java     |  8 ++++++++
 .../cn/pluss/platform/impl/AppMenuServiceImpl.java | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

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<AppMenuMapper, AppMenu> impl
     @Override
     public List<Map<String, Object>> 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<Map<String, Object>> result = new ArrayList<>();
@@ -66,8 +66,18 @@ public class AppMenuServiceImpl extends ServiceImpl<AppMenuMapper, AppMenu> impl
             appMenuList = baseMapper.getByNavCode(dict.getId(),userType, clientType);
         }
 
+        //根据版本号
+        String version = request.getHeader("version");
+
         Map<String, Object> 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())) {