From ec12ec5a72d2f357a9f5dc9db7044b9469513f0d Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Mon, 24 May 2021 13:07:04 +0800
Subject: [PATCH] 因子默认单位添加;角色、菜单更新

---
 screen-manage/src/main/resources/mapper/VersionMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/screen-manage/src/main/resources/mapper/VersionMapper.xml b/screen-manage/src/main/resources/mapper/VersionMapper.xml
index 78ec004..b8f5a8b 100644
--- a/screen-manage/src/main/resources/mapper/VersionMapper.xml
+++ b/screen-manage/src/main/resources/mapper/VersionMapper.xml
@@ -35,15 +35,15 @@
 	  v.`id`,v.`name`,v.`desc`,v.`create_time`,v.`update_time`,s.`id` AS sid,s.`code` as scode,s.`name` AS sname ,u.dataKey,u.dataValue,vsu.`max_value` ,vsu.`min_value`
     FROM
 	  `version` v
-    JOIN
+    LEFT JOIN
 	  version_sensor_unit vsu
     ON
 	  v.`id` = vsu.`version_id` AND vsu.`is_delete` = 0
-    JOIN
+    LEFT JOIN
 	  sensor s
     ON
 	  s.`code` = vsu.`sensor_code` AND s.`is_delete` = 0
-    JOIN
+    LEFT JOIN
 	(
 	  SELECT
 		sdd.datakey,sdd.dataValue,sdd.is_delete

--
Gitblit v1.8.0