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

litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxCatalogController.java

@@ -63,8 +63,10 @@ public class WxCatalogController {
         if (id != null) {
             currentCategory = categoryService.findById(id);
         } else {
+             if (l1CatList.size() > 0) {
                 currentCategory = l1CatList.get(0);
             }
+        }
 
         // 当前一级分类目录对应的二级分类目录
         List<LitemallCategory> currentSubCategory = null;