From 2cc61edcd7ad2f61308f10c7b40cc44d43dbc530 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 20 Jul 2021 22:04:22 +0800
Subject: [PATCH] 巡逻路线绑定修改
---
src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml | 2 +-
src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
index 1e484a3..35eaed9 100644
--- a/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
+++ b/src/main/java/org/springblade/modules/alarm/mapper/AlarmMapper.xml
@@ -41,6 +41,7 @@
<result column="baphone" property="baphone"/>
<result column="deviceName" property="deviceName"/>
<result column="manufacturers" property="manufacturers"/>
+ <result column="xllx" property="xllx"/>
</resultMap>
<!-- 通用查询映射结果 -->
@@ -219,7 +220,8 @@
e.manufacturers,
a.place as place,
e.channelNumber,
- u.name as baname,
+ a.xllx,
+ u.real_name as baname,
u.id as baid,
u.phone as baphone
from sys_alarm a
diff --git a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
index 6911df3..6905bce 100644
--- a/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
+++ b/src/main/java/org/springblade/modules/routeIn/mapper/RouteinMapper.xml
@@ -65,7 +65,7 @@
and r.routeName like '%${routeName}%'
</if>
<if test="id!=null and id!=''">
- AND d.snumber = #{id}
+ AND r.id = #{id}
</if>
</select>
--
Gitblit v1.9.3