From 830d1772dfae2ea5eaaf41ecb7cdbcb9efffc6c5 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Thu, 28 Jan 2021 16:09:42 +0800
Subject: [PATCH] 设备，警情调整
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index c36cf32..ea812e9 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -24,6 +24,9 @@
<result column="pay" property="pay"/>
<result column="expireTime" property="expireTime"/>
<result column="heartbeat" property="heartbeat"/>
+ <result column="province" property="province"/>
+ <result column="city" property="city"/>
+ <result column="district" property="district"/>
</resultMap>
<resultMap id="treeNodeResultMap" type="org.springblade.core.tool.node.TreeNode">
@@ -202,12 +205,13 @@
dept.wd,
dept.street AS streeName,
u.yname,
- d.addvnm,
- dept.addvcd
+ dept.addvcd,
+ dept.province,
+ dept.city,
+ dept.district
FROM
sys_equipment dept
LEFT JOIN sys_suser u ON u.ynumber = dept.ownerId
- LEFT JOIN sys_district d ON d.addvcds = dept.addvcd
LEFT JOIN sys_street s ON s.id = dept.street WHERE dept.deviceNumber=#{deviceNumber}
</select>
--
Gitblit v1.9.3