修改设备管理

device-manager/src/main/java/com/mortals/xhx/base/system/menu/service/impl/MenuServiceImpl.java

@@ -8,6 +8,7 @@
 
 package com.mortals.xhx.base.system.menu.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.mortals.framework.common.code.YesNo;
 import com.mortals.framework.exception.AppException;
 import com.mortals.framework.model.Context;
@@ -21,6 +22,7 @@ import com.mortals.xhx.base.system.menu.model.MenuQuery;
 import com.mortals.xhx.base.system.menu.service.MenuService;
 
 import com.mortals.xhx.common.code.YesNoEnum;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -36,6 +38,7 @@ import java.util.stream.Collectors;
  * @version 1.0.0
  */
 @Service("menuService")
+@Slf4j
 public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity, Long> implements MenuService {
 
     @Override
@@ -52,9 +55,10 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
 
     @Override
     public List<MenuEntity> findTreeMenu(IUser user, Set<String> urls) throws AppException {
-        Set<Long> authIds = new HashSet<Long>();
-        Map<Long, MenuEntity> menuMap = new HashMap<Long, MenuEntity>();
+        Set<Long> authIds = new HashSet<>();
+        Map<Long, MenuEntity> menuMap = new HashMap<>();
         List<MenuEntity> userModuleList = this.findAllEnable();
+        log.info("userModuleList:{}", JSON.toJSONString(userModuleList));
         for (MenuEntity sysModule : userModuleList) {
             if (sysModule == null) {
                 continue;
@@ -74,8 +78,9 @@ public class MenuServiceImpl extends AbstractCRUDServiceImpl<MenuDao, MenuEntity
                 }
             }
         }
-        List<MenuEntity> outlookBar = new ArrayList<MenuEntity>();
-        List<MenuEntity> norightList = new ArrayList<MenuEntity>();
+        log.info("menuMap:{}", JSON.toJSONString(menuMap));
+        List<MenuEntity> outlookBar = new ArrayList<>();
+        List<MenuEntity> norightList = new ArrayList<>();
         for (MenuEntity sysModule : userModuleList) {
             if (!user.isAdmin() && !authIds.contains(sysModule.getId())) {
                 norightList.add(sysModule);