diff --git a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppSafetyHatController.java b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppSafetyHatController.java
index ddefd38..a765ed9 100644
--- a/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppSafetyHatController.java
+++ b/bonus-modules/bonus-app/src/main/java/com/bonus/app/controller/AppSafetyHatController.java
@@ -44,7 +44,6 @@ public class AppSafetyHatController extends BaseController {
         Integer pageSize = Convert.toInt(ServletUtils.getParameter(BusinessConstants.PAGE_SIZE), 10);
         PageHelper.startPage(pageNum, pageSize);
         PageInfo<SafetyHatVo> pageInfo = service.getSafetyHatLists(dto);
-//        List<SafetyHatVo> list = service.getSafetyHatLists(dto);
         return AjaxResult.success(pageInfo.getList());
     }
 
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml
index ef9ade5..43785e9 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml
@@ -73,37 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tdub.dev_id AS devId,
             tdub.dev_type AS devType,
             tdu.remarks,
-            td.dev_code AS devCode,
-            td.dev_name AS devName,
-            tdub.ly_time AS lyTime,
-            tdub.gh_time AS ghTime,
-            sdd.dict_label AS deviceTypeName,
-            twt.team_name AS teamName,
-            twt.team_leader AS teamLeader,
-            twt.leader_phone AS leaderPhone,
-            tpp.power_name AS powerName,
-            tp.pro_name AS proName,
-            tpd.depart_name AS departName,
-            tp.depart_id AS departId
-            FROM tb_dev_use tdu
-            LEFT JOIN t_work_team twt ON tdu.team_id = twt.team_id AND twt.del_flag = 0
-            LEFT JOIN tb_project_power tpp ON tpp.id = tdu.gt_id AND tpp.del_flag = 0
-            LEFT JOIN tb_project tp ON tp.id = tdu.pro_id AND tp.del_flag = 0
-            LEFT JOIN tb_project_depart tpd ON tpd.id = tp.depart_id AND tpd.del_flag = 0
-            LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
-            LEFT JOIN tb_device td ON tdub.dev_id = td.id AND td.del_flag = 0
-            LEFT JOIN sys_dict_data sdd ON td.dev_type = sdd.dict_value AND sdd.dict_type = 'sys_device_type'
-            WHERE tdu.del_flag = 0 AND tdub.dev_type NOT IN ('shx')
-            <if test="devType!=null and devType!=''">
-                AND td.dev_type = #{devType}
-            </if>
-        UNION ALL
-            SELECT tdub.id,
-            tdub.dev_id AS devId,
-            tdub.dev_type AS devType,
-            tdu.remarks,
-            tsb.box_code AS devCode,
-            tsb.box_name AS devName,
+            tdub.dev_code AS devCode,
+            tdub.dev_name AS devName,
             tdub.ly_time AS lyTime,
             tdub.gh_time AS ghTime,
             sdd.dict_label AS deviceTypeName,
@@ -121,10 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN tb_project_depart tpd ON tpd.id = tp.depart_id AND tpd.del_flag = 0
             LEFT JOIN tb_dev_use_bid tdub ON tdu.id = tdub.id
             LEFT JOIN sys_dict_data sdd ON tdub.dev_type = sdd.dict_value AND sdd.dict_type = 'sys_device_type'
-            LEFT JOIN tb_sh_box tsb ON tdub.dev_id = tsb.id AND tsb.del_flag = 0
-            WHERE tdu.del_flag = 0 AND tdub.dev_type = 'shx'
-            <if test="devType!=null and devType!='' and devType != 'shx'">
-                AND tsb.id = -1
+            WHERE tdu.del_flag = 0
+            <if test="devType!=null and devType!=''">
+                AND tdub.dev_type = #{devType}
             </if>
         ) a
         <where>