Commit 0b0f95f3 authored by Junling Bu's avatar Junling Bu
Browse files

Merge branch 'master' of https://github.com/linlinjava/litemall

parents cf6f59d8 a3a36d82
...@@ -63,7 +63,9 @@ public class WxCatalogController { ...@@ -63,7 +63,9 @@ public class WxCatalogController {
if (id != null) { if (id != null) {
currentCategory = categoryService.findById(id); currentCategory = categoryService.findById(id);
} else { } else {
currentCategory = l1CatList.get(0); if (l1CatList.size() > 0) {
currentCategory = l1CatList.get(0);
}
} }
// 当前一级分类目录对应的二级分类目录 // 当前一级分类目录对应的二级分类目录
...@@ -143,4 +145,4 @@ public class WxCatalogController { ...@@ -143,4 +145,4 @@ public class WxCatalogController {
data.put("currentSubCategory", currentSubCategory); data.put("currentSubCategory", currentSubCategory);
return ResponseUtil.ok(data); return ResponseUtil.ok(data);
} }
} }
\ No newline at end of file
Supports Markdown
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