Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-enterprise-base into developer

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

@@ -109,13 +109,23 @@ public class AuthInterceptor extends HandlerInterceptorAdapter {
                         temp = getOperationModule(tempMap.get(temp.toString()).getMenuId(), tempMap);
                     }
                 }
-                int secondLevelMenuId = tempMap.get(temp.toString()).getMenuId();
-                String secondLevelMenuName = tempMap.get(temp.toString()).getMenuName();
-                //获取第一层级的页面
-                temp = getOperationModule(tempMap.get(temp.toString()).getMenuId(), tempMap);
-                int firstLevelMenuId = tempMap.get(temp.toString()).getMenuId();
-                String firstLevelMenuName = tempMap.get(temp.toString()).getMenuName();
-
+                int secondLevelMenuId = 0;
+                String secondLevelMenuName = "无";
+                int firstLevelMenuId;
+                String firstLevelMenuName;
+                //如果是第二级的
+                if (menuInfo.getLevel().intValue() == 2) {
+                    secondLevelMenuId = tempMap.get(temp.toString()).getMenuId();
+                    secondLevelMenuName = tempMap.get(temp.toString()).getMenuName();
+                    //获取第一层级的页面
+                    temp = getOperationModule(tempMap.get(temp.toString()).getMenuId(), tempMap);
+                    firstLevelMenuId = tempMap.get(temp.toString()).getMenuId();
+                    firstLevelMenuName = tempMap.get(temp.toString()).getMenuName();
+                } else {
+                    //第一级
+                    firstLevelMenuId = tempMap.get(temp.toString()).getMenuId();
+                    firstLevelMenuName = tempMap.get(temp.toString()).getMenuName();
+                }
                 log.info("一级页面的ID和名称:{},{}", firstLevelMenuId, firstLevelMenuName);
                 log.info("二级页面的ID和名称:{},{}", secondLevelMenuId, secondLevelMenuName);
                 request.setAttribute("moduleMenuId", secondLevelMenuId);

gic-enterprise-download/src/main/java/com/gic/download/utils/log/LogUtils.java

@@ -47,7 +47,11 @@ public class LogUtils {
         //操作模块
         String moduleMenuName = (String) RequestContext.getContext().getRequest().getAttribute("moduleMenuName");
         Integer moduleMenuId = (Integer) RequestContext.getContext().getRequest().getAttribute("moduleMenuId");
-        logDTO.setRelationId(Long.valueOf(moduleMenuId));
+        if (moduleMenuId != null) {
+            logDTO.setRelationId(Long.valueOf(moduleMenuId));
+        } else {
+            LOGGER.info("操作模块数据有误");
+        }
         //操作对象
 
         //账号（手机号）？