From 3f7bcb1fb68b78a2cd2a87b44098f1de70378d92 Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期一, 30 十二月 2019 18:59:59 +0800 Subject: [PATCH] 完成微信小程序登录流程 --- fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java index fe8f074..486dc1d 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v2/UserOrderControllerV2.java @@ -244,11 +244,13 @@ try { long count = 0; List<CommonOrderVO> list = null; - List<ESOrder> listES = esOrderService.multiMatchQuery(key, uid.toString()); + List<ESOrder> listES = esOrderService.query(key, uid.toString()); + if (listES.size() != 0) { list = commonOrderService.searchOrderByUid(page, Constant.PAGE_SIZE, uid, listES); count = commonOrderService.countSearchOrderByUid(uid, listES); } + if (list == null) { list = new ArrayList<>(); } -- Gitblit v1.8.0