xufenglei
2018-03-26 b4aa377b5e7898cd2ef018cc385a19af67a56839
src/main/java/com/moral/service/impl/AlarmConfigServiceImpl.java
@@ -50,11 +50,11 @@
    public Optional queryValueByOrganizationId(int organizationId) {
        String key = RedisUtils.getAlarmKey(organizationId);
        AlarmConfigValue alarmConfigValue = redisUtils.get(key,new TypeReference<AlarmConfigValue>(){});
        if(alarmConfigValue==null){
        if(alarmConfigValue==null) {
            AlarmConfig alarmConfig = alarmConfigMapper.selectByOrganizationId(organizationId);
            if(alarmConfig!=null&&alarmConfig.getValue()!=null){
                alarmConfigValue  = alarmConfig.getValue();
            }else{
            if (alarmConfig != null && alarmConfig.getValue() != null) {
                alarmConfigValue = alarmConfig.getValue();
            } else {
                alarmConfigValue = getDefaultAlarmConfigValue();
            }
        }