diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
index c13f119..513e616 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
@@ -80,10 +80,10 @@
      */
     @RequestMapping(value = "/listRecord")
     @ResponseBody
-    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){
+    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime, String deviceType){
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         page.setRecords(list);
         return ResponseData.success(super.packForBT(page));
@@ -94,13 +94,13 @@
      */
     @RequestMapping(value = "/exportRecord")
     @ResponseBody
-    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException {
+    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime,String deviceType) throws IOException {
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         super.exportExcel(AcsExportEnum.RECORDS_EXPORT, list, response);
     }

diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
index c13f119..513e616 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
@@ -80,10 +80,10 @@
      */
     @RequestMapping(value = "/listRecord")
     @ResponseBody
-    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){
+    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime, String deviceType){
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         page.setRecords(list);
         return ResponseData.success(super.packForBT(page));
@@ -94,13 +94,13 @@
      */
     @RequestMapping(value = "/exportRecord")
     @ResponseBody
-    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException {
+    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime,String deviceType) throws IOException {
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         super.exportExcel(AcsExportEnum.RECORDS_EXPORT, list, response);
     }
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
index d593676..707d627 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
@@ -22,7 +22,7 @@
     List<Map<String,Object>> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
     List<Map<String,Object>> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
-    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deviceType")String deviceType);
 
     List<Map<String,Object>> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType);
     Integer statisticByPerson(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("deptId")Long deptId,@Param("personId")Long personId,@Param("inoutType") String inoutType);

diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
index c13f119..513e616 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
@@ -80,10 +80,10 @@
      */
     @RequestMapping(value = "/listRecord")
     @ResponseBody
-    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){
+    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime, String deviceType){
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         page.setRecords(list);
         return ResponseData.success(super.packForBT(page));
@@ -94,13 +94,13 @@
      */
     @RequestMapping(value = "/exportRecord")
     @ResponseBody
-    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException {
+    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime,String deviceType) throws IOException {
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         super.exportExcel(AcsExportEnum.RECORDS_EXPORT, list, response);
     }
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
index d593676..707d627 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
@@ -22,7 +22,7 @@
     List<Map<String,Object>> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
     List<Map<String,Object>> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
-    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deviceType")String deviceType);
 
     List<Map<String,Object>> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType);
     Integer statisticByPerson(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("deptId")Long deptId,@Param("personId")Long personId,@Param("inoutType") String inoutType);
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
index 2f928ef..a2265b9 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
@@ -119,7 +119,8 @@
         `recognition_records` re
         LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE
         LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID
-        WHERE p.PERSON_TYPE = 1
+        LEFT JOIN bus_device device ON device.DEV_CODE = re.DEV_CODE
+        WHERE 1 = 1
         <if test="keyword != null and keyword != ''">
             AND ( p.NAME LIKE CONCAT('%',#{keyword},'%')
             OR p.ID_CARD_NO LIKE CONCAT('%',#{keyword},'%'))
@@ -149,6 +150,9 @@
         <if test="endTime != null and endTime != ''">
             AND re.DATETIME  <![CDATA[ <=  ]]> #{endTime}
         </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND device.DEV_TYPE LIKE CONCAT('%',#{deviceType},'%')
+        </if>
     </select>
 
     <select id="statisticByDept" resultType="map">

diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
index c13f119..513e616 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
@@ -80,10 +80,10 @@
      */
     @RequestMapping(value = "/listRecord")
     @ResponseBody
-    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){
+    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime, String deviceType){
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         page.setRecords(list);
         return ResponseData.success(super.packForBT(page));
@@ -94,13 +94,13 @@
      */
     @RequestMapping(value = "/exportRecord")
     @ResponseBody
-    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException {
+    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime,String deviceType) throws IOException {
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         super.exportExcel(AcsExportEnum.RECORDS_EXPORT, list, response);
     }
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
index d593676..707d627 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
@@ -22,7 +22,7 @@
     List<Map<String,Object>> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
     List<Map<String,Object>> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
-    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deviceType")String deviceType);
 
     List<Map<String,Object>> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType);
     Integer statisticByPerson(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("deptId")Long deptId,@Param("personId")Long personId,@Param("inoutType") String inoutType);
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
index 2f928ef..a2265b9 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
@@ -119,7 +119,8 @@
         `recognition_records` re
         LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE
         LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID
-        WHERE p.PERSON_TYPE = 1
+        LEFT JOIN bus_device device ON device.DEV_CODE = re.DEV_CODE
+        WHERE 1 = 1
         <if test="keyword != null and keyword != ''">
             AND ( p.NAME LIKE CONCAT('%',#{keyword},'%')
             OR p.ID_CARD_NO LIKE CONCAT('%',#{keyword},'%'))
@@ -149,6 +150,9 @@
         <if test="endTime != null and endTime != ''">
             AND re.DATETIME  <![CDATA[ <=  ]]> #{endTime}
         </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND device.DEV_TYPE LIKE CONCAT('%',#{deviceType},'%')
+        </if>
     </select>
 
     <select id="statisticByDept" resultType="map">
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java
index 3811ebd..940acb6 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java
@@ -20,7 +20,7 @@
     List<Map<String,Object>> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime);
     List<Map<String,Object>> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime);
 
-    List<Map<String,Object>> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime);
+    List<Map<String,Object>> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime,String deviceType);
 
     List<Map<String, Object>> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType);
     List<Map<String, Object>> statisticByPerson(String doorCode,String beginTime, String endTime,Long deptId, Long personId);

diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
index c13f119..513e616 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/controller/RecognitionRecordsController.java
@@ -80,10 +80,10 @@
      */
     @RequestMapping(value = "/listRecord")
     @ResponseBody
-    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime){
+    public Object listRecord(String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime, String deviceType){
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         page.setRecords(list);
         return ResponseData.success(super.packForBT(page));
@@ -94,13 +94,13 @@
      */
     @RequestMapping(value = "/exportRecord")
     @ResponseBody
-    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime) throws IOException {
+    public void exportRecord(HttpServletResponse response,String keyword,Long personDeptId,String doorCode,String devCode,String isAbnormal,String beginTime,String endTime,String deviceType) throws IOException {
         Page<Map<String,Object>> page = new PageFactory<Map<String,Object>>().defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);
         page.setSize(Integer.MAX_VALUE);
         DataScope dataScope = permissionService.getCurrUserDataScope();
-        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime);
+        List<Map<String,Object>> list = recordsService.selectRecordScopePage(dataScope,page,keyword,personDeptId,doorCode,devCode,isAbnormal,beginTime,endTime,deviceType);
         new RecognitionRecordsWarpper(list).warp();
         super.exportExcel(AcsExportEnum.RECORDS_EXPORT, list, response);
     }
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
index d593676..707d627 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/RecognitionRecordsMapper.java
@@ -22,7 +22,7 @@
     List<Map<String,Object>> selectStaffDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
     List<Map<String,Object>> selectVisitorDataScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("doorCode")String doorCode, @Param("devCode")String devCode, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
 
-    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime);
+    List<Map<String,Object>> selectRecordScopePage(@Param("dataScope")DataScope dataScope, @Param("page")Page page, @Param("keyword")String keyword, @Param("personDeptId")Long personDeptId, @Param("doorCode")String doorCode, @Param("devCode")String devCode,@Param("isAbnormal") String isAbnormal, @Param("beginTime")String beginTime, @Param("endTime")String endTime, @Param("deviceType")String deviceType);
 
     List<Map<String,Object>> statisticByDept(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("inoutType") String inoutType);
     Integer statisticByPerson(@Param("doorCode") String doorCode,@Param("deptIds")String deptIds, @Param("beginTime") String beginTime,@Param("endTime") String endTime,@Param("deptId")Long deptId,@Param("personId")Long personId,@Param("inoutType") String inoutType);
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
index 2f928ef..a2265b9 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/dao/mapping/RecognitionRecordsMapper.xml
@@ -119,7 +119,8 @@
         `recognition_records` re
         LEFT JOIN acs_door door ON door.DOOR_CODE = re.DOOR_CODE
         LEFT JOIN person_ext_view p ON p.ID = re.PERSON_ID
-        WHERE p.PERSON_TYPE = 1
+        LEFT JOIN bus_device device ON device.DEV_CODE = re.DEV_CODE
+        WHERE 1 = 1
         <if test="keyword != null and keyword != ''">
             AND ( p.NAME LIKE CONCAT('%',#{keyword},'%')
             OR p.ID_CARD_NO LIKE CONCAT('%',#{keyword},'%'))
@@ -149,6 +150,9 @@
         <if test="endTime != null and endTime != ''">
             AND re.DATETIME  <![CDATA[ <=  ]]> #{endTime}
         </if>
+        <if test="deviceType != null and deviceType !=''">
+            AND device.DEV_TYPE LIKE CONCAT('%',#{deviceType},'%')
+        </if>
     </select>
 
     <select id="statisticByDept" resultType="map">
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java
index 3811ebd..940acb6 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/IRecognitionRecordsService.java
@@ -20,7 +20,7 @@
     List<Map<String,Object>> selectStaffDataScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime);
     List<Map<String,Object>> selectVisitorDataScopePage(DataScope dataScope, Page page, String keyword, String doorCode, String devCode, String beginTime, String endTime);
 
-    List<Map<String,Object>> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime);
+    List<Map<String,Object>> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime,String deviceType);
 
     List<Map<String, Object>> statisticByDept(String doorCode,String beginTime, String endTime,String inoutType);
     List<Map<String, Object>> statisticByPerson(String doorCode,String beginTime, String endTime,Long deptId, Long personId);
diff --git a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java
index 47cea35..8f6a715 100644
--- a/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java
+++ b/casic-iris-acs/src/main/java/com/casic/missiles/modular/system/service/impl/RecognitionRecordsServiceImpl.java
@@ -76,8 +76,8 @@
     }
 
     @Override
-    public List<Map<String, Object>> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime) {
-        List<Map<String, Object>> list = this.baseMapper.selectRecordScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime);
+    public List<Map<String, Object>> selectRecordScopePage(DataScope dataScope, Page page, String keyword, Long personDeptId, String doorCode, String devCode, String isAbnormal, String beginTime, String endTime,String deviceType) {
+        List<Map<String, Object>> list = this.baseMapper.selectRecordScopePage(dataScope, page, keyword, personDeptId, doorCode, devCode, isAbnormal, beginTime, endTime,deviceType);
         for (Map<String, Object> res : list) {
             if(ToolUtil.isNotEmpty(res.get("personDeptId"))) {
                 Long deptid = Long.valueOf(String.valueOf(res.get("personDeptId")));