diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
index 0a4fba87..feb46461 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java
@@ -108,6 +108,7 @@ public class DepotHeadController {
                                         @RequestParam("endTime") String endTime,
                                         @RequestParam(value = "roleType", required = false) String roleType,
                                         @RequestParam("type") String type,
+                                        @RequestParam("creator") Long creator,
                                         @RequestParam("remark") String remark,
                                         HttpServletRequest request)throws Exception {
         BaseResponseInfo res = new BaseResponseInfo();
@@ -132,9 +133,9 @@ public class DepotHeadController {
             endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
             Boolean forceFlag = systemConfigService.getForceApprovalFlag();
             List<DepotHeadVo4InDetail> list = depotHeadService.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag,
-                    StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark, (currentPage-1)*pageSize, pageSize);
+                    StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), creator, remark, (currentPage-1)*pageSize, pageSize);
             int total = depotHeadService.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag,
-                    StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), remark);
+                    StringUtil.toNull(materialParam), depotList, oId, StringUtil.toNull(number), creator, remark);
             map.put("total", total);
             //存放数据json数组
             if (null != list) {
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
index 5173223d..2a7547ab 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java
@@ -74,6 +74,7 @@ public interface DepotHeadMapperEx {
             @Param("depotList") List<Long> depotList,
             @Param("oId") Integer oId,
             @Param("number") String number,
+            @Param("creator") Long creator,
             @Param("remark") String remark,
             @Param("offset") Integer offset,
             @Param("rows") Integer rows);
@@ -89,6 +90,7 @@ public interface DepotHeadMapperEx {
             @Param("depotList") List<Long> depotList,
             @Param("oId") Integer oId,
             @Param("number") String number,
+            @Param("creator") Long creator,
             @Param("remark") String remark);
 
     List<DepotHeadVo4InOutMCount> findInOutMaterialCount(
diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
index ee97c2e7..b0999cdb 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java
@@ -624,10 +624,11 @@ public class DepotHeadService {
 
     public List<DepotHeadVo4InDetail> findInOutDetail(String beginTime, String endTime, String type, String [] creatorArray,
                                                 String [] organArray, Boolean forceFlag, String materialParam, List<Long> depotList, Integer oId, String number,
-                                                String remark, Integer offset, Integer rows) throws Exception{
+                                                Long creator, String remark, Integer offset, Integer rows) throws Exception{
         List<DepotHeadVo4InDetail> list = null;
         try{
-            list =depotHeadMapperEx.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag, materialParam, depotList, oId, number, remark, offset, rows);
+            list =depotHeadMapperEx.findInOutDetail(beginTime, endTime, type, creatorArray, organArray, forceFlag,
+                    materialParam, depotList, oId, number, creator, remark, offset, rows);
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
@@ -636,10 +637,11 @@ public class DepotHeadService {
 
     public int findInOutDetailCount(String beginTime, String endTime, String type, String [] creatorArray,
                               String [] organArray, Boolean forceFlag, String materialParam, List<Long> depotList, Integer oId, String number,
-                              String remark) throws Exception{
+                              Long creator, String remark) throws Exception{
         int result = 0;
         try{
-            result =depotHeadMapperEx.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag, materialParam, depotList, oId, number, remark);
+            result =depotHeadMapperEx.findInOutDetailCount(beginTime, endTime, type, creatorArray, organArray, forceFlag,
+                    materialParam, depotList, oId, number, creator, remark);
         }catch(Exception e){
             JshException.readFail(logger, e);
         }
diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
index 67604795..89cb66f6 100644
--- a/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
+++ b/jshERP-boot/src/main/resources/mapper_xml/DepotHeadMapperEx.xml
@@ -324,6 +324,9 @@
             <bind name="bindKey" value="'%'+materialParam+'%'"/>
             and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
         </if>
+        <if test="creator != null">
+            and dh.creator=#{creator}
+        </if>
         <if test="remark != null and remark !=''">
             <bind name="bindRemark" value="'%'+remark+'%'"/>
             and (dh.remark like #{bindRemark} or di.remark like #{bindRemark})
@@ -382,6 +385,9 @@
             <bind name="bindKey" value="'%'+materialParam+'%'"/>
             and (me.bar_code like #{bindKey} or m.name like #{bindKey} or m.standard like #{bindKey} or m.model like #{bindKey})
         </if>
+        <if test="creator != null">
+            and dh.creator=#{creator}
+        </if>
         <if test="remark != null and remark !=''">
             <bind name="bindRemark" value="'%'+remark+'%'"/>
             and (dh.remark like #{bindRemark} or di.remark like #{bindRemark})