Merge branch 'website_1_1_20220802'

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/open/OpenSubjectController.java

@@ -58,6 +58,11 @@ public class OpenSubjectController extends BaseController {
                 row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
             }
         });
+        List<Subject> collect = pageInfo.getRows()
+                                        .stream()
+                                        .filter(row -> row.getParentSubjectId() != null && row.getParentSubjectId() > 0)
+                                        .collect(Collectors.toList());
+        pageInfo.setRows(collect);
         return succeed(pageInfo);
     }
 }