From 1e0e0e4dee6b616f62b39bf512c6b80b1f8bdc5b Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 29 Aug 2024 19:06:57 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java | 2 +-
 .../src/main/resources/mapper/bracelet/DeviceMapper.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java
index f1c5e54..5b80c26 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/BaseProjectServiceImpl.java
@@ -75,7 +75,7 @@ public class BaseProjectServiceImpl implements IBaseProjectService
             for (BaseProject vo : list) {
                 vo.setContactInformation(Sm4Utils.decode(vo.getContactInformation()));
                 vo.setAppnum(projectMapper.getAppCount(vo.getProjectId()));
-                vo.setPronum(projectMapper.getProCount(project.getProjectId()));
+                vo.setPronum(projectMapper.getProCount(vo.getProjectId()));
             }
         } catch (Exception e) {
             log.error("查询人员列表", e);
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
index 2f92930..942e183 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/DeviceMapper.xml
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectDeviceById" parameterType="int" resultType="com.bonus.common.entity.bracelet.vo.DeviceVo">
-        select td.id as deviceId,tdd.dict_label AS deviceTypeName,td.dev_name as deviceName,td.dev_code as deviceCode,td.dev_status as deviceStatus,td.dev_index as deviceIndex
+        select td.id as deviceId,td.dev_type as deviceType,tdd.dict_label AS deviceTypeName,td.dev_name as deviceName,td.dev_code as deviceCode,td.dev_status as deviceStatus,td.dev_index as deviceIndex
         from tb_device td
         left join sys_dict_data tdd on tdd.dict_value=td.dev_type AND tdd .dict_type='sys_device_type'
         where td.id = #{deviceId}  and td.del_flag = 0