Skip to content

H
haoban-manage3.0
Commit 12ed96dc by guojx
Options

Merge branch 'bugfix-2024-05-28-clerk-member' into 'master' 

导购列表接口修复

See merge request !1788
parents 6a6063e9 bde90c38
Showing with 2 additions and 2 deletions
haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/data/DataController.java
...@@ -133,8 +133,8 @@ public class DataController { ...@@ -133,8 +133,8 @@ public class DataController {
jsonObject.put("clerkId", normalList.stream().collect(Collectors.joining(","))); jsonObject.put("clerkId", normalList.stream().collect(Collectors.joining(",")));
Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), apolloKey); Map<String, Object> res = DataApiUtils.http(jsonObject.toJSONString(), apolloKey);
Page page = DataApiUtils.getPageData(res); Page page = DataApiUtils.getPageData(res);
List<JSONObject> pageList = DataApiUtils.getPageList(res); List<JSONObject> pageList = page.getResult();
if (CollectionUtils.isEmpty(pageList)) { if (pageList == null) {
pageList = new ArrayList<>(); pageList = new ArrayList<>();
} }
if (isFirstPage) { if (isFirstPage) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment