diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
index e5efd0ed..9ec5ffc8 100644
--- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
+++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaMachine.java
@@ -221,5 +221,9 @@ public class MaMachine extends BaseEntity {
   @ApiModelProperty(value = "1：二维码绑定标识  2：rfid绑定标识")
   private Integer flag;
 
+  /** 1.机具仓储 2.调试仓储 */
+  private String maType;
+
+  private String maTypeName;
 
 }
diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
index 7d9744e1..55f5f2a5 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/service/impl/MaMachineServiceImpl.java
@@ -11,6 +11,7 @@ import com.bonus.sgzb.base.mapper.MaMachineMapper;
 import com.bonus.sgzb.base.mapper.MaPropInfoMapper;
 import com.bonus.sgzb.base.mapper.MaTypeMapper;
 import com.bonus.sgzb.base.service.MaMachineService;
+import com.bonus.sgzb.common.core.constant.Constants;
 import com.bonus.sgzb.common.core.exception.ServiceException;
 import com.bonus.sgzb.common.security.utils.SecurityUtils;
 import org.springframework.stereotype.Service;
@@ -38,6 +39,12 @@ public class MaMachineServiceImpl implements MaMachineService {
 
     @Override
     public List<MaMachine> getMaMachine(MaMachine maMachine) {
+        if (maMachine.getMaType() != null && ("1").equals(maMachine.getMaType())) {
+            maMachine.setMaTypeName(Constants.JJ);
+        }
+        if (maMachine.getMaType() != null && ("2").equals(maMachine.getMaType())) {
+            maMachine.setMaTypeName(Constants.TS);
+        }
         return maMachineMapper.getMaMachine(maMachine);
     }
 
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
index 485e5a3b..f23d1a98 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineMapper.xml
@@ -48,10 +48,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join ma_type mt on m.type_id = mt.type_id
         left join ma_type mt1 on mt.parent_id = mt1.type_id
         left join ma_type mt2 on mt1.parent_id = mt2.type_id
+        LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id
         left join ma_label_bind mmb on m.ma_id = mmb.ma_id and m.type_id = mmb.type_id
         left join ma_prop_set mps on mt.type_id = mps.type_id
         left join ma_house_info mhi on m.own_house = mhi.house_id
         <where>
+            <if test="maTypeName!=null and maTypeName != ''">
+                AND sd.dept_name = #{maTypeName}
+            </if>
             <if test="maId != null and maId != ''">
                 AND ma_id = #{maId}
             </if>