diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
index 916706d9..a01cfd8a 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/controller/MachineController.java
@@ -43,7 +43,7 @@ public class MachineController extends BaseController {
     /**
      * 查询机具设备管理列表
      */
-    @ApiOperation(value = "查询机具设备管理列表")
+    @ApiOperation(value = "查询机具设备管理列表1")
     @RequiresPermissions("ma:machine:list")
     @GetMapping("/list")
     public TableDataInfo list(Machine machine)
@@ -56,7 +56,7 @@ public class MachineController extends BaseController {
     /**
      * 查询机具设备管理列表
      */
-    @ApiOperation(value = "查询机具设备管理列表")
+    @ApiOperation(value = "查询机具设备管理列表2")
     //@RequiresPermissions("ma:machine:typeList")
     @GetMapping("/getTypeList")
     public AjaxResult list(Type type)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
index 99486019..2f9c55e8 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@@ -92,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             or ma.own_house like concat('%', #{keyWord}, '%')
                   )
         </if>
+        <if test="typeId != null">
+            and ma.type_id = #{typeId}
+        </if>
         <if test="materialType != null and materialType != ''">
               and mt3.type_name like concat('%', #{materialType}, '%')
         </if>