diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java
index 9b7037d..ad75eff 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java
@@ -132,7 +132,7 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService {
                 mapper.updateReturnDeviceData(dto,1);
             }else if(Objects.equals(dto.getDevType(), BusinessConstants.AQM)){
                 // 设备类型为安全帽时，判断是否全部归还
-                int result = mapper.isAllDeviceReturn(dto,1);
+                int result = mapper.isAllDeviceReturn(dto,2);
                 if(result > 0){
                     return AjaxResult.error("班组人员未归还安全帽设备");
                 }
diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/TeamMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/TeamMgeServiceImpl.java
index 01e3215..287a33a 100644
--- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/TeamMgeServiceImpl.java
+++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/TeamMgeServiceImpl.java
@@ -96,7 +96,8 @@ public class TeamMgeServiceImpl implements ITeamMgeService {
             }
             // 判断班组长是否已经创建班组
             List<Integer> isDistributionList = mapper.isDistribution(vo);
-            if (isDistributionList.get(0) != 1 || isDistributionList.get(1) > 0) {
+            // 1. 班组长不变 2. 选了没有分配班组的班组长 3.选了已经分配的班组长
+            if (isDistributionList.get(0) != 0 || isDistributionList.get(1) > 0 || isDistributionList.get(2) == 0) {
                 return AjaxResult.error("所选班组长已分配班组");
             }
             // 移除人员时 判断人员是否已经分配手环或者设备
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 43785e9..f93048b 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
@@ -114,10 +114,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND INSTR(a.devCode,#{devCode}) > 0
             </if>
             <if test="lyTime!=null and lyTime!=''">
-                AND DATE_FORMAT(a.lyTime,'%y%m%d') BETWEEN #{lyTime} AND #{lyTime}
+                AND DATE_FORMAT(a.lyTime,'%Y-%m-%d') BETWEEN #{lyTime} AND #{lyTime}
             </if>
             <if test="ghTime!=null and ghTime!=''">
-                AND DATE_FORMAT(a.ghTime,'%y%m%d') BETWEEN #{ghTime} AND #{ghTime}
+                AND DATE_FORMAT(a.ghTime,'%Y-%m-%d') BETWEEN #{ghTime} AND #{ghTime}
             </if>
             <if test="roleCode!='administrators' and roleCode!='depart'">
                 AND a.departId = -1
@@ -146,12 +146,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE team_id IS NULL AND tsb.del_flag = 0
         </if>
     </select>
-    <!--判断设备是否全部归还-->
+    <!--判断设备是否全部归还 1.手环 2.安全帽-->
     <select id="isAllDeviceReturn" resultType="java.lang.Integer">
-        SELECT COUNT(*)
-        FROM tb_dev_use_bid tdub
-        LEFT JOIN tb_sh_use tsu ON tdub.id = tsu.use_id AND tsu.bid_type = #{type}
-        WHERE tdub.id = #{params.id} AND tdub.dev_id = #{params.devId} AND tdub.dev_type = #{params.devType} AND tdub.dev_code = #{params.devCode} AND tsu.time_type = 1
+        <if test="type == 1">
+            SELECT COUNT(*) FROM tb_bracelet WHERE box_id = #{params.devId} AND bid_id IS NOT NULL
+        </if>
+        <if test="type == 2">
+            SELECT COUNT(*)
+            FROM tb_device td
+            LEFT JOIN tb_dev_ly tdl ON td.id = tdl.dev_id
+            WHERE td.id = #{params.devId} AND td.dev_type = #{params.devType} AND td.del_flag = 0 AND tdl.ly_user IS NOT NULL
+        </if>
     </select>
     <!--获取绑定班组的班组长-->
     <select id="getTeamLeader" resultType="java.lang.Long">
diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml
index 40323e8..d1dc34a 100644
--- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml
+++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml
@@ -87,7 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND (
                 INSTR(twt.team_name,#{keyWord}) > 0 OR
                 INSTR(twt.team_leader,#{keyWord}) > 0 OR
-                INSTR(tp.pro_name,#{proName}) > 0
+                INSTR(tp.pro_name,#{keyWord}) > 0
             )
         </if>
         ORDER BY twt.create_time DESC
@@ -173,7 +173,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                tb.sh_code AS braceletCode,
                IF(twt.team_id IS NULL,0,1) AS isTeamLeader
         FROM tb_people tp
-        LEFT JOIN t_work_team twt ON tp.id = twt.team_leader_id AND twt.del_flag = 0
+        LEFT JOIN t_work_team twt ON tp.id = twt.team_leader_id AND twt.del_flag = 0 AND twt.team_status = 0
         LEFT JOIN tb_bracelet tb ON tp.id = tb.bid_id AND tb.del_flag = 0
         WHERE tp.team_id = #{teamId} AND tp.del_flag = 0
         <if test="name != null and name!=''">
@@ -193,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             SELECT COUNT(*) FROM tb_people WHERE id = #{teamLeaderId} AND team_id = #{teamId} AND del_flag = 0
             UNION ALL
             SELECT COUNT(*) FROM tb_people WHERE id = #{teamLeaderId} AND team_id != #{teamId} AND del_flag = 0 AND team_id IS NOT NULL
+            UNION ALL
+            SELECT COUNT(*) FROM tb_people WHERE id = #{teamLeaderId} AND team_id IS NULL
         </if>
     </select>
     <!--班组是否已分配设备-->
diff --git a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
index 8ec6213..94eb0a8 100644
--- a/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
+++ b/bonus-modules/bonus-system/src/main/resources/mapper/system/SelectMapper.xml
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                twt.pro_id AS proId
         FROM t_work_team twt
         LEFT JOIN tb_project tp on twt.pro_id = tp.id AND tp.del_flag = 0
-        WHERE twt.del_flag = 0
+        WHERE twt.del_flag = 0 AND twt.team_status = 0
         <if test="roleCode!='administrators' and roleCode!='depart'">
             AND tp.depart_id = -1
         </if>