Jelajahi Sumber

Merge branch 'v1.0.0' of http://39.106.8.246:3003/apm/energy-alarm-service into v1.0.0

lixing 3 tahun lalu
induk
melakukan
030c3be2b0

+ 1 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmrule/service/impl/ProjectAlarmRuleServiceImpl.java

@@ -230,6 +230,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
         //更新项目报警
         projectAlarmRule.setModifiedTime(new Date());
         projectAlarmRule.setModifier(PoemsContext.getContext().getUserId());
+        projectAlarmRule.setBelong(updateProjectAlarmRuleDTO.getBelong());
         updateById(projectAlarmRule);
         //删除报警对象关联关系
         //projectAlarmRuleObjRelService.deleteRelation(updateProjectAlarmRuleDTO.getId());

+ 1 - 0
src/main/java/com/persagy/apm/alarmservice/project/alarmruleobjrel/service/impl/ProjectAlarmRuleObjRelServiceImpl.java

@@ -382,6 +382,7 @@ public class ProjectAlarmRuleObjRelServiceImpl extends ServiceImpl<ProjectAlarmR
         List<String> projectAlarmRuleIdList = projectAlarmRuleService.queryAlarmRule(queryRuleObjRelDTO);
         QueryWrapper<ProjectAlarmRuleObjRel> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_PROJECT_ID, projectId);
+        if(projectAlarmRuleIdList.size()>0)
         queryWrapper.in(ProjectAlarmRuleObjRel.PROP_PROJECT_ALARM_RULE_ID, projectAlarmRuleIdList);
         queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_VALID, ValidEnum.TRUE.getType());
         queryWrapper.eq(ProjectAlarmRuleObjRel.PROP_OPEN, 1);