From 016974d1441f460da316aabf037140a159700004 Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Thu, 22 Aug 2024 22:07:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/device/EqEquipmentMapper.xml  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml
index 23d01513a..c350dcb01 100644
--- a/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/device/EqEquipmentMapper.xml
@@ -25,9 +25,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectEquipmentVoPage" resultType="org.dromara.web.domain.vo.EqUserEquipmentVo">
         SELECT
-            e.user_id,
+            s.user_id,
             s.nick_name,
-            e.user_name,
+            s.user_name,
             COUNT(e.equipment_id) AS bind_num, -- 设备总数
             SUM(CASE WHEN e.line_status = 0 THEN 1 ELSE 0 END) AS offline_num, -- 离线个数
             SUM(CASE WHEN e.line_status = 1 THEN 1 ELSE 0 END) AS online_num -- 在线个数
@@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY
-            e.user_id,e.user_name, s.nick_name
+            s.user_id,s.user_name, s.nick_name
     </select>
 
     <select id="selectEquipmentStatistic" resultType="org.dromara.web.domain.vo.EqEquipmentStatisticsVo">