From 61755c0d2df4401c0bafd824b0f6565654181b13 Mon Sep 17 00:00:00 2001 From: xyiege Date: Fri, 5 May 2023 22:23:06 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E9=83=A8=E5=88=86=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../szwh/service/impl/OrderServiceImpl.java | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) 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 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 euolist = orderUserMapper.getSearchNameOrIslicode(entrust_name); + sokey = entrust_name; + } + // 非空时候 + if(StringUtils.isNotEmpty(sokey)){ + List 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(); // 如果是商品名称