server

oceanbase · Jan 21, 2025 · 8117c83 · 8117c83
1 parent 9836921
commit 8117c83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/odc-service/src/main/java/com/oceanbase/odc/config/HookConfiguration.java b/server/odc-service/src/main/java/com/oceanbase/odc/config/HookConfiguration.java
@@ -17,6 +17,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -190,8 +191,9 @@ private void checkRiskLevelReference(Long id, String name, Long organizationId,
         Set<RiskDetectRule> referencedRiskDetectRules =
                 riskDetectService.listAllByOrganizationId(organizationId)
                         .stream()
-                        .filter(rule -> rule.getRootNode().find(ConditionExpression.ENVIRONMENT_ID.name(), id)
-                                || rule.getRootNode().find(ConditionExpression.ENVIRONMENT_NAME.name(), name))
+                        .filter(rule -> Objects.nonNull(rule.getRootNode())
+                                && (rule.getRootNode().find(ConditionExpression.ENVIRONMENT_ID.name(), id)
+                                        || rule.getRootNode().find(ConditionExpression.ENVIRONMENT_NAME.name(), name)))
                         .collect(Collectors.toSet());
 
         if (!referencedRiskDetectRules.isEmpty()) {

diff --git a/...ce/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java b/...ce/src/main/java/com/oceanbase/odc/service/regulation/risklevel/model/RiskDetectRule.java
@@ -46,8 +46,6 @@ public class RiskDetectRule {
     /**
      * rule root node
      */
-    @NotNull
-    @Valid
     private BaseTreeNode rootNode;
 
     @NotNull
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,8 +46,6 @@ public class RiskDetectRule { @@
         /**
          * rule root node
          */
-        @NotNull
-        @Valid
         private BaseTreeNode rootNode;
         @NotNull
@@ Expand Down @@