lixing 3 роки тому
батько
коміт
0c51868fdb

+ 1 - 4
src/main/java/com/persagy/apm/alarmservice/group/calculatemethod/service/impl/CalculateMethodServiceImpl.java

@@ -140,19 +140,16 @@ public class CalculateMethodServiceImpl extends ServiceImpl<CalculateMethodMappe
         
         if (queryCalculateMethodDTO != null) {
                                 
-            // todo 需判断使用like还是eq
             if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getName())) {
                 queryWrapper.like(CalculateMethod.PROP_NAME, queryCalculateMethodDTO.getName());
             }
                                         
-            // todo 需判断使用like还是eq
             if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getFormula())) {
                 queryWrapper.like(CalculateMethod.PROP_FORMULA, queryCalculateMethodDTO.getFormula());
             }
                                         
-            // todo 需判断使用like还是eq
             if (StringUtils.isNotEmpty(queryCalculateMethodDTO.getMonitorIndicatorId())) {
-                queryWrapper.like(CalculateMethod.PROP_MONITOR_INDICATOR_ID, queryCalculateMethodDTO.getMonitorIndicatorId());
+                queryWrapper.eq(CalculateMethod.PROP_MONITOR_INDICATOR_ID, queryCalculateMethodDTO.getMonitorIndicatorId());
             }
                                             
             if (queryCalculateMethodDTO.getIsDefault() != null) {

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

@@ -525,7 +525,7 @@ public class ProjectAlarmRuleServiceImpl extends ServiceImpl<ProjectAlarmRuleMap
                 addProjectAlarmRuleObjRelDTO.setProjectAlarmRuleId(projectAlarmRule.getId());
                 addProjectAlarmRuleObjRelDTO.setProjectId("Pj" + project.getProjectId());
                 addProjectAlarmRuleObjRelDTO.setObjId(record.getId());
-                addProjectAlarmRuleObjRelDTO.setObjName(record.getName());
+                addProjectAlarmRuleObjRelDTO.setObjName(record.getLocalName());
                 addProjectAlarmRuleObjRelDTO.setOpen(INTEGER_ONE);
                 addRelationList.add(addProjectAlarmRuleObjRelDTO);
             }