diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java
index c37b900..7a06934 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/app/AppParamsDto.java
@@ -139,4 +139,7 @@ public class AppParamsDto {
private String file;
private String params;
+
+ /**是否在用 0 在用 1归还*/
+ private String isLy;
}
diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java
index d52a6c0..e4dd188 100644
--- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java
+++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/BraceletParamsDto.java
@@ -121,7 +121,7 @@ public class BraceletParamsDto {
/**关键字*/
private String keyWord;
- /**是否领用*/
+ /**是否在用 0 在用 1归还*/
private String isLy;
@Data
diff --git a/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml b/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml
index fb90465..606c837 100644
--- a/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml
+++ b/bonus-modules/bonus-app/src/main/resources/mapper/AppEquipmentReqMapper.xml
@@ -124,6 +124,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND a.departId = #{departId}
+
+ AND IF(a.ghTime IS NULL,'0','1') = #{isLy}
+
ORDER BY IFNULL(a.ghTime,now()) DESC,a.lyTime DESC
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 9e2f606..6cc2f9b 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
@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"