xujiaheng před 3 roky
rodič
revize
40cb8cac84

+ 0 - 1
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/model/dto/UpdateProjectAlarmRuleDTO.java

@@ -57,7 +57,6 @@ public class UpdateProjectAlarmRuleDTO {
     private String classCode;
 
     @ApiModelProperty(value = "查询条件",required = true)
-    @NotBlank(message = "查询条件必传")
     private String condition;
     
 }

+ 1 - 0
src/main/resources/mapper/ProjectAlarmRuleMapper.xml

@@ -38,6 +38,7 @@
         select count(*)
         from project_alarm_rule a
         left join project_alarm_rule_obj_rel b on a.id = b.project_alarm_rule_id
+        left join alarm_condition c on a.alarm_condition_id = c.id
         where a.group_id = #{groupId} and a.valid = 1
         <if test="alarmItemCode != null and alarmItemCode != ''">
             and a.alarm_item_code = #{alarmItemCode}