diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
index 4e3af21f..937046b3 100644
--- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
+++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/ma/domain/Type.java
@@ -35,6 +35,14 @@ public class Type extends BaseEntity {
     @ApiModelProperty(value = "类型名称")
     private String typeName;
 
+    /** 库管员昵称 */
+    @ApiModelProperty(value = "库管员昵称")
+    private String keeperNickName;
+
+    /** 维修员昵称 */
+    @ApiModelProperty(value = "维修员昵称")
+    private String repairNickName;
+
     /** 仓库名称 */
     @ApiModelProperty(value = "物资仓库名称")
     private String houseName;
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
index 72f157ac..9384f98e 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/TypeMapper.xml
@@ -8,7 +8,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="typeId"    column="type_id"    />
         <result property="typeName"    column="type_name"    />
         <result property="parentId"    column="parent_id"    />
+        <result property="keeperNickName"    column="keeper_nick_name"    />
+        <result property="repairNickName"    column="repair_nick_name"    />
         <result property="houseId"    column="house_id"    />
+        <result property="houseName"    column="house_name"    />
         <result property="storageNum"    column="storage_num"    />
         <result property="typeCode"    column="type_code"    />
         <result property="modelCode"    column="model_code"    />
@@ -503,13 +506,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             mt4.type_id, mt4.type_name, mt4.parent_id, mt4.storage_num, mt4.type_code, mt4.model_code, mt4.unit_id, mt4.unit_name, mt4.manage_type, mt4.lease_price,
             mt4.eff_time, mt4.rent_price, mt4.buy_price, mt4.pay_ratio, mt4.pay_price, mt4.tax_ratio, mt4.level, mt4.rated_load, mt4.test_load, mt4.holding_time, mt4.warn_num,
-            mt4.create_by, mt4.create_time, mt4.update_by, mt4.update_time, mt4.is_plan,mt4.is_ancuo, mt4.remark, mt4.fac_model, mt4.intelligent_code, whs.house_id, mtk.user_id
+            mt4.create_by, mt4.create_time, mt4.update_by, mt4.update_time, mt4.is_plan,mt4.is_ancuo, mt4.remark, mt4.fac_model, mt4.intelligent_code, whs.house_id, whi.house_name,su.nick_name as keeper_nick_name
         from ma_type mt4
                  left join ma_type mt3 on mt3.type_id=mt4.parent_id
                  left join ma_type mt2 on mt2.type_id=mt3.parent_id
                  left join ma_type mt1 on mt1.type_id=mt2.parent_id
                  left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
                  left join ma_type_keeper mtk on mt4.type_id=mtk.type_id
+                 left join sys_user su on mtk.user_id=su.user_id
         where mt4.del_flag = 0 and mt4.level = 4
 
         UNION
@@ -517,11 +522,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             mt3.type_id, mt3.type_name, mt3.parent_id, mt3.storage_num, mt3.type_code, mt3.model_code, mt3.unit_id, mt3.unit_name, mt3.manage_type, mt3.lease_price,
             mt3.eff_time, mt3.rent_price, mt3.buy_price, mt3.pay_ratio, mt3.pay_price, mt3.tax_ratio, mt3.level, mt3.rated_load, mt3.test_load, mt3.holding_time, mt3.warn_num,
-            mt3.create_by, mt3.create_time, mt3.update_by, mt3.update_time, mt3.is_plan,mt3.is_ancuo, mt3.remark, mt3.fac_model, mt3.intelligent_code, whs.house_id, null as user_id
+            mt3.create_by, mt3.create_time, mt3.update_by, mt3.update_time, mt3.is_plan,mt3.is_ancuo, mt3.remark, mt3.fac_model, mt3.intelligent_code, whs.house_id, whi.house_name,null as keeper_nick_name
         from ma_type mt3
                  left join ma_type mt2 on mt2.type_id=mt3.parent_id
                  left join ma_type mt1 on mt1.type_id=mt2.parent_id
                  left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
         where mt3.del_flag = 0 and mt3.level = 3
 
         UNION
@@ -529,10 +535,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             mt2.type_id, mt2.type_name, mt2.parent_id, mt2.storage_num, mt2.type_code, mt2.model_code, mt2.unit_id, mt2.unit_name, mt2.manage_type, mt2.lease_price,
             mt2.eff_time, mt2.rent_price, mt2.buy_price, mt2.pay_ratio, mt2.pay_price, mt2.tax_ratio, mt2.level, mt2.rated_load, mt2.test_load, mt2.holding_time, mt2.warn_num,
-            mt2.create_by, mt2.create_time, mt2.update_by, mt2.update_time, mt2.is_plan,mt2.is_ancuo, mt2.remark, mt2.fac_model, mt2.intelligent_code, whs.house_id, null as user_id
+            mt2.create_by, mt2.create_time, mt2.update_by, mt2.update_time, mt2.is_plan,mt2.is_ancuo, mt2.remark, mt2.fac_model, mt2.intelligent_code, whs.house_id, whi.house_name, null as keeper_nick_name
         from ma_type mt2
                  left join ma_type mt1 on mt1.type_id=mt2.parent_id
                  left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
         where mt2.del_flag = 0 and mt2.level = 2
 
         UNION
@@ -540,9 +547,64 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select
             mt1.type_id, mt1.type_name, mt1.parent_id, mt1.storage_num, mt1.type_code, mt1.model_code, mt1.unit_id, mt1.unit_name, mt1.manage_type, mt1.lease_price,
             mt1.eff_time, mt1.rent_price, mt1.buy_price, mt1.pay_ratio, mt1.pay_price, mt1.tax_ratio, mt1.level, mt1.rated_load, mt1.test_load, mt1.holding_time, mt1.warn_num,
-            mt1.create_by, mt1.create_time, mt1.update_by, mt1.update_time, mt1.is_plan,mt1.is_ancuo, mt1.remark, mt1.fac_model, mt1.intelligent_code, whs.house_id, null as user_id
+            mt1.create_by, mt1.create_time, mt1.update_by, mt1.update_time, mt1.is_plan,mt1.is_ancuo, mt1.remark, mt1.fac_model, mt1.intelligent_code, whs.house_id, whi.house_name,null as keeper_nick_name
         from ma_type mt1
                  left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
+        where mt1.del_flag = 0 and mt1.level = 1
+
+        order by type_id
+    </select>
+
+    <select id="selectTypeList4repair" parameterType="com.bonus.material.ma.domain.Type" resultMap="TypeResult">
+        select
+            mt4.type_id, mt4.type_name, mt4.parent_id, mt4.storage_num, mt4.type_code, mt4.model_code, mt4.unit_id, mt4.unit_name, mt4.manage_type, mt4.lease_price,
+            mt4.eff_time, mt4.rent_price, mt4.buy_price, mt4.pay_ratio, mt4.pay_price, mt4.tax_ratio, mt4.level, mt4.rated_load, mt4.test_load, mt4.holding_time, mt4.warn_num,
+            mt4.create_by, mt4.create_time, mt4.update_by, mt4.update_time, mt4.is_plan,mt4.is_ancuo, mt4.remark, mt4.fac_model, mt4.intelligent_code, whs.house_id, whi.house_name,su.nick_name as repair_nick_name
+        from ma_type mt4
+                 left join ma_type mt3 on mt3.type_id=mt4.parent_id
+                 left join ma_type mt2 on mt2.type_id=mt3.parent_id
+                 left join ma_type mt1 on mt1.type_id=mt2.parent_id
+                 left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
+                 left join ma_type_repair mtr on mt4.type_id=mtr.type_id
+                 left join sys_user su on mtr.user_id=su.user_id
+        where mt4.del_flag = 0 and mt4.level = 4
+
+        UNION
+
+        select
+            mt3.type_id, mt3.type_name, mt3.parent_id, mt3.storage_num, mt3.type_code, mt3.model_code, mt3.unit_id, mt3.unit_name, mt3.manage_type, mt3.lease_price,
+            mt3.eff_time, mt3.rent_price, mt3.buy_price, mt3.pay_ratio, mt3.pay_price, mt3.tax_ratio, mt3.level, mt3.rated_load, mt3.test_load, mt3.holding_time, mt3.warn_num,
+            mt3.create_by, mt3.create_time, mt3.update_by, mt3.update_time, mt3.is_plan,mt3.is_ancuo, mt3.remark, mt3.fac_model, mt3.intelligent_code, whs.house_id, whi.house_name,null as repair_nick_name
+        from ma_type mt3
+                 left join ma_type mt2 on mt2.type_id=mt3.parent_id
+                 left join ma_type mt1 on mt1.type_id=mt2.parent_id
+                 left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
+        where mt3.del_flag = 0 and mt3.level = 3
+
+        UNION
+
+        select
+            mt2.type_id, mt2.type_name, mt2.parent_id, mt2.storage_num, mt2.type_code, mt2.model_code, mt2.unit_id, mt2.unit_name, mt2.manage_type, mt2.lease_price,
+            mt2.eff_time, mt2.rent_price, mt2.buy_price, mt2.pay_ratio, mt2.pay_price, mt2.tax_ratio, mt2.level, mt2.rated_load, mt2.test_load, mt2.holding_time, mt2.warn_num,
+            mt2.create_by, mt2.create_time, mt2.update_by, mt2.update_time, mt2.is_plan,mt2.is_ancuo, mt2.remark, mt2.fac_model, mt2.intelligent_code, whs.house_id, whi.house_name, null as repair_nick_name
+        from ma_type mt2
+                 left join ma_type mt1 on mt1.type_id=mt2.parent_id
+                 left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
+        where mt2.del_flag = 0 and mt2.level = 2
+
+        UNION
+
+        select
+            mt1.type_id, mt1.type_name, mt1.parent_id, mt1.storage_num, mt1.type_code, mt1.model_code, mt1.unit_id, mt1.unit_name, mt1.manage_type, mt1.lease_price,
+            mt1.eff_time, mt1.rent_price, mt1.buy_price, mt1.pay_ratio, mt1.pay_price, mt1.tax_ratio, mt1.level, mt1.rated_load, mt1.test_load, mt1.holding_time, mt1.warn_num,
+            mt1.create_by, mt1.create_time, mt1.update_by, mt1.update_time, mt1.is_plan,mt1.is_ancuo, mt1.remark, mt1.fac_model, mt1.intelligent_code, whs.house_id, whi.house_name,null as repair_nick_name
+        from ma_type mt1
+                 left join wh_house_set whs on mt1.type_id=whs.type_id
+                 left join wh_house_info whi on whs.house_id=whi.house_id
         where mt1.del_flag = 0 and mt1.level = 1
 
         order by type_id