加日志

gic-enterprise-common/src/main/java/com/gic/enterprise/interceptor/AuthInterceptor.java

@@ -104,6 +104,7 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
             MenuInfo menuInfo = moduleUrlMap.get(moduleUrl);
             if (menuInfo != null) {
                 Map<String, MenuInfo> tempMap = listToMap(menuInfoList);
+                log.info("接口的菜单信息:{}", JSON.toJSONString(menuInfo));
 
                 Integer temp = menuInfo.getMenuId();
                 //获取第二层级的页面
@@ -124,7 +125,12 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
                     MenuInfo secondMenuInfo = tempMap.get(temp.toString());
                     secondLevelMenuId = secondMenuInfo.getMenuId();
                     secondLevelMenuName = secondMenuInfo.getMenuName();
-                    secondLevelUrl = secondLevelUrl + secondMenuInfo.getProjectUrlForWeb() + secondMenuInfo.getMenuUrl();
+                    if (StringUtils.isNotBlank(secondMenuInfo.getProjectUrlForWeb())) {
+                        secondLevelUrl = secondLevelUrl + secondMenuInfo.getProjectUrlForWeb();
+                    }
+                    if (StringUtils.isNotBlank(secondMenuInfo.getMenuUrl())) {
+                        secondLevelUrl += secondMenuInfo.getMenuUrl();
+                    }
                     //获取第一层级的页面
                     temp = getOperationModule(secondMenuInfo.getMenuId(), tempMap);
                     firstLevelMenuId = tempMap.get(temp.toString()).getMenuId();
@@ -135,7 +141,12 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
                     firstLevelMenuId = firstMenuInfo.getMenuId();
                     secondLevelMenuId = firstMenuInfo.getMenuId();
                     firstLevelMenuName = firstMenuInfo.getMenuName();
-                    secondLevelUrl = secondLevelUrl + firstMenuInfo.getProjectUrlForWeb() + firstMenuInfo.getMenuUrl();
+                    if (StringUtils.isNotBlank(firstMenuInfo.getProjectUrlForWeb())) {
+                        secondLevelUrl = secondLevelUrl + firstMenuInfo.getProjectUrlForWeb();
+                    }
+                    if (StringUtils.isNotBlank(firstMenuInfo.getMenuUrl())) {
+                        secondLevelUrl += firstMenuInfo.getMenuUrl();
+                    }
                 }
                 log.info("一级页面的ID和名称:{},{}", firstLevelMenuId, firstLevelMenuName);
                 log.info("二级页面的ID和名称:{},{}", secondLevelMenuId, secondLevelMenuName);