瀏覽代碼

增加aciton null 判断

zhou-hao 7 年之前
父節點
當前提交
a018dfac7b

+ 2 - 1
hsweb-system/hsweb-system-authorization/hsweb-system-authorization-service/hsweb-system-authorization-service-simple/src/main/java/org/hswebframework/web/service/authorization/simple/SimpleAuthorizationSettingService.java

@@ -327,7 +327,8 @@ public class SimpleAuthorizationSettingService extends GenericEntityService<Auth
                 return false;
             }
             List<String> allActions = entity.getActions().stream().map(ActionEntity::getAction).collect(Collectors.toList());
-            if (isNotEmpty(entity.getActions())) {
+
+            if (isNotEmpty(entity.getActions()) && isNotEmpty(detail.getActions())) {
                 detail.setActions(detail.getActions().stream().filter(allActions::contains).collect(Collectors.toSet()));
             }
             if (isEmpty(entity.getSupportDataAccessTypes())) {