解决角色列表权限设置错误和登陆用户缓存报空指针

power-admin/src/main/java/com/manage/controller/PermissionsController.java

@@ -1,10 +1,8 @@
 package com.manage.controller;
 
 import com.manage.annotation.RequiresPermissions;
-import com.manage.entity.Power_User;
 import com.manage.service.User_Dept_MenuService;
 import com.manage.vo.Power_UserVo;
-import com.manage.vo.User_Dept_Menu;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
@@ -18,9 +16,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.lang.reflect.Method;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -85,7 +81,7 @@ public class PermissionsController {
             if (user.getRoleId() == 0 && user.getRoleId() != -100) {
                 object = pjp.proceed();
             }else{
-                Boolean flag = false;
+                boolean flag = false;
                 Set<String> menus = user.getMenus();
                 if (null != menus && !menus.isEmpty()) {
                     for (String menuUrl : menus) {

power-admin/src/main/java/com/manage/controller/RoleController.java

@@ -51,7 +51,7 @@ public class RoleController {
      * @Author ly
      *  @Description 分页
      * */
-    @RequiresPermissions(value="/role/pageUI")
+    @RequiresPermissions(value="/role/pageUINotDown")
     @RequestMapping("/pageList")
     @ResponseBody
     public PageHelper<Power_RoleVo> list(Power_RoleVo powerRole,HttpServletRequest request){
@@ -77,7 +77,7 @@ public class RoleController {
      *  @Description 返回页面
      * */
     @OptionalLog(module = "查看",methods = "角色管理页面")
-    @RequiresPermissions(value="/role/pageUI")
+    @RequiresPermissions(value="/role/pageUINotDown")
     @RequestMapping("/pageUINotDown")
     public String pageUINotDown(){
         CacheManager.addExcCount("noExc");

power-service/src/main/java/com/manage/service/cache/CacheManager.java

@@ -97,8 +97,7 @@ public class CacheManager {
             if(cacheMap.size() > 0) {
                 for (Map.Entry<String, Cache> map : cacheMap.entrySet()) {
                     Cache cache = CacheManager.getCacheInfo(map.getKey());
-                    assert cache != null;
-                    if (null != cache.getValue() && cache.getValue() instanceof Power_UserVo) {
+                    if (null != cache && null != cache.getValue() && cache.getValue() instanceof Power_UserVo) {
                         Power_UserVo o = (Power_UserVo) cache.getValue();
                         if (obj.getUserName().equals(o.getUserName()) && !map.getKey().equals(token)) {
                             clearOnly(map.getKey());