设备列表bug修复

springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml

@@ -189,10 +189,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.device_id, d.device_name, d.product_id, d.product_name,
             d.user_id, d.user_name, d.tenant_id, d.tenant_name, d.serial_number,
             d.firmware_version, d.status,d.rssi,d.is_shadow ,d.location_way,
-            d.things_model_value, d.active_time,d.img_url,g.group_id,u.user_id
+            d.things_model_value, d.active_time,d.img_url,u.user_id
         from iot_device d
         left join iot_device_user u on u.device_id = d.device_id
-        left join iot_device_group g on g.device_id=d.device_id
+        <if test="groupId != null and groupId !=0  "> left join iot_device_group g on g.device_id=d.device_id </if>
         <where>
             <if test="groupId != null and groupId !=0  "> and g.group_id = #{groupId}</if>
             <if test="userId != null and userId != 0"> and u.user_id = #{userId}</if>

vue/src/views/iot/product/product-alert.vue

@@ -7,6 +7,7 @@
         <el-col :span="1.5">
             <el-button type="warning" plain icon="el-icon-refresh" size="mini" @click="getList">刷新</el-button>
         </el-col>
+         <el-tag type="danger" style="margin-left:15px;">该功能暂不可用,后面版本发布</el-tag>
     </el-row>
 
     <el-table v-loading="loading" :data="alertList" @selection-change="handleSelectionChange" border size="mini">