wangliang 3 年之前
父节点
当前提交
1ef2e51919

+ 11 - 9
distributed-print/src/main/java/com/qmth/distributed/print/api/MenuCustomController.java

@@ -120,14 +120,16 @@ public class MenuCustomController {
                     sysRoleQueryWrapper.lambda().eq(SysRole::getSchoolId, tSchoolPrivilegeParam.getSchoolId());
                     List<SysRole> sysRoleList = sysRoleService.list(sysRoleQueryWrapper);
 
-                    QueryWrapper<SysRolePrivilege> sysRolePrivilegeQueryWrapper = new QueryWrapper<>();
-                    sysRolePrivilegeQueryWrapper.lambda()
-                            .in(SysRolePrivilege::getRoleId, sysRoleList.stream().map(s -> s.getId()).collect(Collectors.toList()))
-                            .in(SysRolePrivilege::getPrivilegeId, changePrivilegeSetIds);
-                    List<SysRolePrivilege> sysRolePrivilegeList = sysRolePrivilegeService.list(sysRolePrivilegeQueryWrapper);
-                    //仅删除绑定了该权限的角色用户缓存
-                    roleSetIds = sysRolePrivilegeList.stream().map(s -> s.getRoleId()).collect(Collectors.toSet());
-                    sysRolePrivilegeService.remove(sysRolePrivilegeQueryWrapper);
+                    if (Objects.nonNull(sysRoleList) && sysRoleList.size() > 0) {
+                        QueryWrapper<SysRolePrivilege> sysRolePrivilegeQueryWrapper = new QueryWrapper<>();
+                        sysRolePrivilegeQueryWrapper.lambda()
+                                .in(SysRolePrivilege::getRoleId, sysRoleList.stream().map(s -> s.getId()).collect(Collectors.toList()))
+                                .in(SysRolePrivilege::getPrivilegeId, changePrivilegeSetIds);
+                        List<SysRolePrivilege> sysRolePrivilegeList = sysRolePrivilegeService.list(sysRolePrivilegeQueryWrapper);
+                        //仅删除绑定了该权限的角色用户缓存
+                        roleSetIds = sysRolePrivilegeList.stream().map(s -> s.getRoleId()).collect(Collectors.toSet());
+                        sysRolePrivilegeService.remove(sysRolePrivilegeQueryWrapper);
+                    }
                 }
             }
             tSchoolPrivilegeService.remove(tSchoolPrivilegeQueryWrapper);
@@ -142,7 +144,7 @@ public class MenuCustomController {
         }
 
         //清缓存
-        if (Objects.nonNull(roleSetIds)) {
+        if (Objects.nonNull(roleSetIds) && roleSetIds.size() > 0) {
             for (Long l : roleSetIds) {
                 commonCacheService.updateRoleCache(l);
                 commonCacheService.updateRolePrivilegeCache(l);