按鈕權限修改

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysPermissionServiceImpl.java

@@ -1,10 +1,5 @@
 package com.usky.system.service.impl;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import com.usky.common.core.util.ServletUtils;
-import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysUser;
 import com.usky.system.domain.SysUserVO;
 import com.usky.system.service.ISysMenuService;
@@ -14,10 +9,12 @@ import com.usky.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashSet;
+import java.util.Set;
+
 
 @Service
-public class SysPermissionServiceImpl implements ISysPermissionService
-{
+public class SysPermissionServiceImpl implements ISysPermissionService {
     @Autowired
     private ISysRoleService roleService;
 
@@ -29,61 +26,48 @@ public class SysPermissionServiceImpl implements ISysPermissionService
 
     /**
      * 获取角色数据权限
-     * 
+     *
      * @param userId 用户Id
      * @return 角色权限信息
      */
     @Override
-    public Set<String> getRolePermission(Long userId)
-    {
+    public Set<String> getRolePermission(Long userId) {
         Set<String> roles = new HashSet<String>();
-
         // 管理员拥有所有权限
-        if (SysUserVO.isAdmin(userId))
-        {
+        SysUser sysUser = userService.selectUserByIdOne(userId);
+        if ("01".equals(sysUser.getUserType())) {
             roles.add("admin");
-        }
-        else
-        {
-            SysUser sysUser = userService.selectUserByIdOne(userId);
-            if ("01".equals(sysUser.getUserType())){
+        } else {
+            if (SysUserVO.isAdmin(userId)) {
                 roles.add("admin");
-            }else {
+            } else {
                 roles.addAll(roleService.selectRolePermissionByUserId(userId));
             }
-
         }
         return roles;
     }
 
     /**
      * 获取菜单数据权限
-     * 
+     *
      * @param userId 用户Id
      * @return 菜单权限信息
      */
     @Override
-    public Set<String> getMenuPermission(Long userId)
-    {
+    public Set<String> getMenuPermission(Long userId) {
         Set<String> perms = new HashSet<String>();
         // 管理员拥有所有权限
-        if (SysUserVO.isAdmin(userId))
-        {
+        SysUser sysUser = userService.selectUserByIdOne(userId);
+        if ("01".equals(sysUser.getUserType())) {
             perms.add("*:*:*");
-        }
-        else
-        {
-            SysUser sysUser = userService.selectUserByIdOne(userId);
-            if ("01".equals(sysUser.getUserType())){
-                perms.addAll(menuService.selectMenuPermsByUserIdOne(SecurityUtils.getTenantId()));
-            }else {
+//                perms.addAll(menuService.selectMenuPermsByUserIdOne(SecurityUtils.getTenantId()));
+        } else {
+            if (SysUserVO.isAdmin(userId)) {
+                perms.add("*:*:*");
+            } else {
                 perms.addAll(menuService.selectMenuPermsByUserId(userId));
             }
         }
-
-
-
-
         return perms;
     }
 }