优化

zhou-hao · zhou-hao · commit cd26ef63224a · 2016-10-27T09:42:22.000+08:00
diff --git a/hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/user/User.java b/hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/user/User.java
@@ -111,42 +111,36 @@ public Set<Module> getModulesByPid(String pid, String level) {
     public boolean hasAccessRole(String rId) {
         if (getUserRoles() != null)
             return getUserRoles().stream().anyMatch(userRole -> userRole.getRoleId().equals(rId));
-//            for (UserRole userRole : getUserRoles()) {
-//                if (rId.equals(userRole.getRoleId())) return true;
-//            }
         return false;
     }
 
     public boolean hasAccessModule(String mId) {
         if (roleInfo == null) initRoleInfo();
         return roleInfo.keySet().stream().anyMatch(mdl -> mdl.getId().equals(mId));
-//        for (Module module : roleInfo.keySet()) {
-//            if (module.getId().equals(mId)) return true;
-//        }
-//        return false;
     }
 
     /**
      * 初始化用户的权限角色信息
      */
     public void initRoleInfo() {
         Map<Module, Set<String>> roleInfo_tmp = new LinkedHashMap<>();
-        for (UserRole userRole : getUserRoles()) {
-            Role role = userRole.getRole();
-            if (role == null) continue;
-            //角色可访问的路径
-            List<RoleModule> roleModules = role.getModules();
-            for (RoleModule roleModule : roleModules) {
-                Module module = roleModule.getModule();
-                if (module == null || module.getStatus() != 1) continue;
-                Set<String> actions = roleInfo_tmp.get(module);
-                if (actions == null)
-                    roleInfo_tmp.put(module, new HashSet<>(roleModule.getActions()));
-                else {
-                    actions.addAll(roleModule.getActions());
+        if (getUserRoles() != null)
+            for (UserRole userRole : getUserRoles()) {
+                Role role = userRole.getRole();
+                if (role == null) continue;
+                //角色可访问的路径
+                List<RoleModule> roleModules = role.getModules();
+                for (RoleModule roleModule : roleModules) {
+                    Module module = roleModule.getModule();
+                    if (module == null || module.getStatus() != 1) continue;
+                    Set<String> actions = roleInfo_tmp.get(module);
+                    if (actions == null)
+                        roleInfo_tmp.put(module, new HashSet<>(roleModule.getActions()));
+                    else {
+                        actions.addAll(roleModule.getActions());
+                    }
                 }
             }
-        }
         //排序
         roleInfo = MapUtils.sortMapByKey(roleInfo_tmp);
     }
@@ -291,8 +285,6 @@ public void setUpdateDate(java.util.Date updateDate) {
     }
 
     public List<UserRole> getUserRoles() {
-        if (userRoles == null)
-            userRoles = new ArrayList<>();
         return userRoles;
     }
 
diff --git a/hsweb-web-controller/src/main/java/org/hsweb/web/controller/module/ModuleMetaController.java b/hsweb-web-controller/src/main/java/org/hsweb/web/controller/module/ModuleMetaController.java
@@ -65,6 +65,7 @@ protected ModuleMetaService getService() {
     public ResponseMessage userModuleMeta(@PathVariable String key) {
         User user = WebUtil.getLoginUser();
         List<UserRole> roles = user.getUserRoles();
+        if (roles == null) roles = new ArrayList<>();
         String[] roleIdList = roles
                 .stream()
                 .map(userRole -> userRole.getRoleId())
