diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
index 8a4a8426..48bf95b9 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/WarehouseKeeperMapper.xml
@@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getWarehouseKeeperInfoAll" resultType="com.bonus.sgzb.base.domain.WarehouseKeeper">
         SELECT mt.type_id as modelId ,mt.type_name as modelName,
-               mt2.type_id, mt2.type_name  ,
-               mt3.type_id as typeId,mt3.type_name as typeName,
+               mt2.type_id, mt2.type_name  as typeName,
+               mt3.type_id as typeId,
                mt3.type_id as kindId,mt4.type_name as kindName,
                su.user_id as userId, su.nick_name as userName
         FROM ma_type mt
@@ -34,7 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             LEFT JOIN ma_type_keeper mtk ON mtk.type_id = mt.type_id
             LEFT JOIN sys_user su ON su.user_id = mtk.user_id
         WHERE mt.`level` = '4' AND mt.`del_flag` = '0'
-
+        <if test="userId != null and userId != ''">
+            AND su.user_id =#{userId}
+        </if>
         <if test="typeName != null and typeName != ''">
             AND mt2.type_name like concat('%', #{typeName}, '%')
         </if>