diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
index eb67ecb..b14614f 100644
--- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
+++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java
@@ -95,21 +95,19 @@ public class OrderServiceImpl implements OrderService {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Map retmap = new HashMap();
         int starrs = page > 1 ? (page - 1) * limit : 0;
+        // 以用户名或其他方式查找
+        String sokey="";
         // 购买方
         if (StringUtils.isNotBlank(buyname)) {
-            // 查找出用户的 islicode 标识符
-            List<OrderUser> odulist = orderUserMapper.getSearchNameOrIslicode(buyname);
-            List bclist = new ArrayList();
-            for (OrderUser ou : odulist) {
-                bclist.add(ou.getBatchcode());
-            }
-            // 该购买者的订单
-            qumap.put("bcin", bclist);
+            sokey = buyname;
         }
-
         // 委托方
         if (StringUtils.isNotBlank(entrust_name)) {
-            List<OrderUser> euolist = orderUserMapper.getSearchNameOrIslicode(entrust_name);
+            sokey = entrust_name;
+        }
+        // 非空时候
+        if(StringUtils.isNotEmpty(sokey)){
+            List<OrderUser> euolist = orderUserMapper.getSearchNameOrIslicode(sokey);
             List buyinArr = new ArrayList();
             for (OrderUser ou : euolist) {
                 buyinArr.add(ou.getBatchcode());
@@ -118,6 +116,7 @@ public class OrderServiceImpl implements OrderService {
             qumap.put("bcin", buyinArr);
         }
 
+
         //组织搜索条件
         Map somap = new HashMap();
         // 如果是商品名称