|
@@ -396,6 +396,8 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
//修改
|
|
|
QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, queryRuleObjRelDTO.getProjectAlarmRuleId());
|
|
|
+ queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+ queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
|
|
|
List<ProjectAlarmRuleObjRel> relList = list(queryWrapper);
|
|
|
resultList = ConvertProjectAlarmRuleObjRelTool.INSTANCE.convert2List(relList);
|
|
|
|
|
@@ -424,6 +426,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
|
|
|
for (String projectAlarmRuleId : projectAlarmRuleIdList) {
|
|
|
QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleId);
|
|
|
+ queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);
|
|
|
list.addAll(list(queryWrapper));
|
|
|
|
|
|
}
|