Merge remote-tracking branch 'origin/master'

2018-08-10 13:31:04 +08:00
parent 8e8c14b17b ac24031e74
commit de76462a00
1 changed files with 1 additions and 1 deletions
--- a/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
+++ b/litemall-wx-api/src/main/java/org/linlinjava/litemall/wx/web/WxGoodsController.java
@@ -189,7 +189,7 @@ public class WxGoodsController {
        if (cur.getPid() == 0) {
            parent = cur;
            children = categoryService.queryByPid(cur.getId());
-            cur = children.get(0);
+            cur = children.size()>0?children.get(0):cur;
        } else {
            parent = categoryService.findById(cur.getPid());
            children = categoryService.queryByPid(cur.getPid());