diff --git a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
index 2352a33..f3d85ff 100644
--- a/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
+++ b/src/main/java/cn/chjyj/szwh/controller/admin/AdminGoodsController.java
@@ -91,6 +91,11 @@ public class AdminGoodsController extends BaseController {
             //qmap.put("data_type",data_type);
             qmap.put("g.goods_status",data_type);
         }
+        // 商品名称
+        String goods= request.getString("goods");
+        if(StringUtils.isNotBlank(goods)){
+            qmap.put("gd.goods_name",goods);
+        }
         // 创建时间
 //        String createtime=request.getParameter("createtime");
 //        if(StringUtils.isNotBlank("createtime")){
diff --git a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
index ab46bfa..5e315b0 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/GoodsServiceImpl.java
@@ -180,9 +180,10 @@ public class GoodsServiceImpl implements GoodsService {
         int total = goodsMapper.countGoodsListVo(gmap);
         retmap.put("total",total);
 
-        // 总的页
-//        int totalpage = (int)Math.ceil(total/limit);
-//        retmap.put("last_page",totalpage);
+        if(total<end){
+            end=total;
+        }
+
         retmap.put("per_page",limit);
         retmap.put("start",start+1); // start 默认为0
         retmap.put("end",end);
diff --git a/src/main/resources/mapper/szwh/GoodsMapper.xml b/src/main/resources/mapper/szwh/GoodsMapper.xml
index e13be41..10ff3cf 100644
--- a/src/main/resources/mapper/szwh/GoodsMapper.xml
+++ b/src/main/resources/mapper/szwh/GoodsMapper.xml
@@ -62,9 +62,16 @@
         <where>
             <if test="map!=null">
                 <foreach collection="map" item="v" index="k" separator="and">
-                    <if test="v != null and v != '' and k!='orderway' and k!='id'">
+                    <if test="v != null and v != '' and k!='orderway' and k!='id' and k!='gd.goods_name' and k!='g.entrust_name'">
                         ${k} = #{v}
                     </if>
+                    <if test="k=='gd.goods_name'">
+                        gd.goods_name like concat('%',#{v},'%')
+                        OR g.goods_islicode like concat('%',#{v},'%')
+                    </if>
+                    <if test="k=='g.entrust_name'">
+                        g.username like concat('%',#{v},'%')
+                    </if>
                 </foreach>
             </if>
         </where>
@@ -83,9 +90,16 @@
             <where>
                 <if test="map!=null">
                     <foreach collection="map" item="v" index="k" separator="and">
-                        <if test="v != null and v != '' and k!='orderway' and k!='id'">
+                        <if test="v != null and v != '' and k!='orderway' and k!='id' and k!='gd.goods_name' and k!='g.entrust_name'">
                             ${k} = #{v}
                         </if>
+                        <if test="k=='gd.goods_name'">
+                            gd.goods_name like concat('%',#{v},'%')
+                            OR g.goods_islicode like concat('%',#{v},'%')
+                        </if>
+                        <if test="k=='g.entrust_name'">
+                            g.username like concat('%',#{v},'%')
+                        </if>
                     </foreach>
                 </if>
             </where>