From 2318e8e2be371bc59e2b237c6d9473fa16608ab1 Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Thu, 17 Mar 2022 17:10:57 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BC=A0=E6=84=9F=E5=99=A8?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/static/js/Iot-ui/sensorTableList.js |  2 +-
 .../resources/mapper/system/SysParamConfigMapper.xml   | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js b/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js
index f23318a..5d1e44e 100644
--- a/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js
+++ b/ruoyi-admin/src/main/resources/static/js/Iot-ui/sensorTableList.js
@@ -51,7 +51,7 @@ const sensorInfoList = function (sensorTypeId) {
                     if (property != "id" && property != "edgeId" && property != "sensorId" && property != 'sensorLocation' && property != 'datatype') {
                         columnsArray.push({
                             field: property,
-                            title: sensorTypeArray.find(array => array.paramTitle === property).paramText,
+                            title: sensorTypeArray.length == 0 ? property : sensorTypeArray.find(array => array.paramTitle === property).paramText,
                             width: property === "imgstr" ? 500 : 160,
                             align: "center",
                         });
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
index 4ebfb93..4200d98 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysParamConfigMapper.xml
@@ -32,10 +32,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectSysParamConfigByObjId" parameterType="Long" resultMap="SysParamConfigResult">
         <include refid="selectSysParamConfigVo"/>
-        where ObjId = #{ObjId}
+        where ObjId = #{objId}
     </select>
         
-    <insert id="insertSysParamConfig" parameterType="SysParamConfig" useGeneratedKeys="true" keyProperty="ObjId">
+    <insert id="insertSysParamConfig" parameterType="SysParamConfig" useGeneratedKeys="true" keyProperty="objId">
         insert into sys_param_config
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="paramType != null">Param_Type,</if>
@@ -79,9 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteSysParamConfigByObjIds" parameterType="String">
-        delete from sys_param_config where ObjId in 
-        <foreach item="ObjId" collection="array" open="(" separator="," close=")">
-            #{ObjId}
+        delete from sys_param_config where ObjId in
+        <foreach item="objId" collection="array" open="(" separator="," close=")">
+            #{objId}
         </foreach>
     </delete>