fix

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/SecurityUtils.java

@@ -114,11 +114,15 @@ public class SecurityUtils
     /**
      * 是否为管理员
      *
-     * @param userId 用户ID
+     * @param userName 用户ID
      * @return 结果
      */
-    public static boolean isAdmin(Long userId)
+    /*public static boolean isAdmin(Long userId)
     {
         return userId != null && (1L == userId||7L == userId||2L == userId);
+    }*/
+    public static boolean isAdmin(String userName)
+    {
+        return userName != null && ("admin".equals(userName));
     }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/system/service/impl/SysMenuServiceImpl.java

@@ -9,7 +9,9 @@ import com.zhongzheng.common.core.domain.TreeSelect;
 import com.zhongzheng.common.core.domain.entity.SysMenu;
 import com.zhongzheng.common.core.domain.entity.SysRole;
 import com.zhongzheng.common.core.domain.entity.SysUser;
+import com.zhongzheng.common.core.domain.model.LoginUser;
 import com.zhongzheng.common.utils.SecurityUtils;
+import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.system.domain.SysRoleMenu;
 import com.zhongzheng.modules.system.domain.vo.MetaVo;
 import com.zhongzheng.modules.system.domain.vo.RouterVo;
@@ -18,6 +20,8 @@ import com.zhongzheng.modules.system.mapper.SysMenuMapper;
 import com.zhongzheng.modules.system.mapper.SysRoleMapper;
 import com.zhongzheng.modules.system.mapper.SysRoleMenuMapper;
 import com.zhongzheng.modules.system.service.ISysUserService;
+import com.zhongzheng.modules.user.entity.ClientLoginUser;
+import com.zhongzheng.modules.user.vo.UserVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -42,6 +46,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Autowired
     private ISysUserService userService;
 
+
+
     /**
      * 根据用户查询系统菜单列表
      *
@@ -105,7 +111,8 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
     @Override
     public List<SysMenu> selectMenuTreeByUserId(Long userId) {
         List<SysMenu> menus = null;
-        if (SecurityUtils.isAdmin(userId)) {
+        SysUser user = userService.selectUserById(userId);
+        if (SecurityUtils.isAdmin(user.getUserName())) {
             menus = baseMapper.selectMenuTreeAll();
         } else {
             menus = baseMapper.selectMenuTreeByUserId(userId);