From 7a0aeaea540803c0768c10c63ac5e78849f01c7a Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 07 Feb 2018 15:25:09 +0800
Subject: [PATCH] 地图相关 bug修复
---
src/main/resources/mapper/DeviceMapper.xml | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/DeviceMapper.xml b/src/main/resources/mapper/DeviceMapper.xml
index 0098098..8ce75ca 100644
--- a/src/main/resources/mapper/DeviceMapper.xml
+++ b/src/main/resources/mapper/DeviceMapper.xml
@@ -158,8 +158,9 @@
</where>
</select>
<select id="selectByMap" parameterType="java.util.Map" resultMap="BaseResultMap">
- SELECT dev.* from device dev
+ SELECT dev.*,dve.version as device_version_value from device dev
left join monitor_point mpt on dev.monitor_point_id = mpt.id
+ left join device_version dve on dev.device_version_id = dve.id
<where>
<if test="@com.moral.common.bean.Constants@isNotSpecialOrgId(orgId)">
mpt.organization_id = #{orgId,jdbcType=VARCHAR}
--
Gitblit v1.8.0