From 2b1b73abffb953468db22a10061e4a5135040037 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Sun, 12 Jun 2022 02:30:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml    | 2 +-
 vue/src/views/iot/device/running-status.vue                     | 2 +-
 vue/src/views/system/role/index.vue                             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
index 470c511c..34e296ec 100644
--- a/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
+++ b/springboot/wumei-iot/src/main/resources/mapper/iot/DeviceMapper.xml
@@ -216,7 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.beginActiveTime != null and params.beginActiveTime != '' and params.endActiveTime != null and params.endActiveTime != ''"> and d.active_time between #{params.beginActiveTime} and #{params.endActiveTime}</if>
         </where>
         group by d.device_id,d.user_id
-        order by d.create_time desc
+        order by u.is_owner desc,d.create_time desc
     </select>
     
     <select id="selectDeviceByDeviceId" parameterType="Long" resultMap="DeviceResult">
diff --git a/vue/src/views/iot/device/running-status.vue b/vue/src/views/iot/device/running-status.vue
index bc4f4f67..1c4531a6 100644
--- a/vue/src/views/iot/device/running-status.vue
+++ b/vue/src/views/iot/device/running-status.vue
@@ -155,7 +155,7 @@
             <mqtt-client ref="mqttClient" :publish="publish" :subscribes="subscribes" @callbackEvent="mqttCallback($event)" />
         </el-col>
 
-        <el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="14">
+        <el-col :xs="24" :sm="24" :md="24" :lg="14" :xl="14" v-if="deviceInfo.readOnlyList.length >0">
             <el-row :gutter="20" style="background-color:#F5F7FA;padding:20px 20px 10px 10px;border-radius:15px;margin-right:5px;">
                 <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="8" v-for="(item,index) in deviceInfo.readOnlyList" :key="index">
                     <el-card shadow="hover" style="border-radius:30px;margin-bottom:20px;">
diff --git a/vue/src/views/system/role/index.vue b/vue/src/views/system/role/index.vue
index c17bfb4a..44d2a855 100644
--- a/vue/src/views/system/role/index.vue
+++ b/vue/src/views/system/role/index.vue
@@ -123,7 +123,7 @@
         </template>
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 1 && scope.row.roleId !== 1">
+        <template slot-scope="scope" v-if="scope.row.roleId !== 1 && scope.row.roleId !== 2 && scope.row.roleId !== 3">
           <el-button
             size="mini"
             type="text"