From 2b8f91e31b512c2868dc5cc26edf5d5d1167c557 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 06 三月 2025 10:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/resources/mapper/DevalarmDataMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/DevalarmDataMapper.xml b/src/main/resources/mapper/DevalarmDataMapper.xml
index 41cd75a..267973a 100644
--- a/src/main/resources/mapper/DevalarmDataMapper.xml
+++ b/src/main/resources/mapper/DevalarmDataMapper.xml
@@ -383,9 +383,9 @@
ORDER by GroupIndexInFBSDevice limit 1
</select>
<select id="getLevelListByUserId" resultType="com.whyc.pojo.DevalarmData">
- select alm_level
- from db_alarm.tb_devalarm_data
- where dev_id in (select distinct db_battinf.tb_battinf.FbsDeviceId
+ select alm_level,StationName5 as stationName5
+ from db_alarm.tb_devalarm_data,db_battinf.tb_battinf where db_alarm.tb_devalarm_data.dev_id=db_battinf.tb_battinf.FbsDeviceId
+ and db_alarm.tb_devalarm_data.dev_id in (select distinct db_battinf.tb_battinf.FbsDeviceId
from db_battinf.tb_battinf,db_user.tb_user_battgroup_baojigroup_battgroup,db_user.tb_user_battgroup_baojigroup_usr,db_user.tb_user_inf
where db_user.tb_user_battgroup_baojigroup_battgroup.BattGroupId=db_battinf.tb_battinf.BattGroupId
and db_user.tb_user_battgroup_baojigroup_usr.baoji_group_id=db_user.tb_user_battgroup_baojigroup_battgroup.baoji_group_id
--
Gitblit v1.9.1