From 9e1db983254a475fd7a069937c3f706fe2efe9b4 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Thu, 08 Feb 2018 11:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/moral/controller/AlarmConfigController.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/moral/controller/AlarmConfigController.java b/src/main/java/com/moral/controller/AlarmConfigController.java
index 70e1121..7d5cecd 100644
--- a/src/main/java/com/moral/controller/AlarmConfigController.java
+++ b/src/main/java/com/moral/controller/AlarmConfigController.java
@@ -17,7 +17,7 @@
AlarmConfigService alarmConfigService;
@GetMapping("get-by-oid")
public ResultBean<AlarmConfig> getAlarmConfigByOrganizationId(int organizationId){
- AlarmConfig alarmConfig = alarmConfigService.SelectByOrganizationId(organizationId);
+ AlarmConfig alarmConfig = alarmConfigService.queryByOrganizationId(organizationId).get();
ResultBean resultBean = new ResultBean();
resultBean.setCode(ResultBean.SUCCESS);
resultBean.setData(alarmConfig);
--
Gitblit v1.8.0