Merge branch 'dev_1_2_1_20220802' into online

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SubjectServiceImpl.java

@@ -115,6 +115,9 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
 
             List<Long> parentIds = subjects.stream().map(Subject::getParentSubjectId).collect(Collectors.toList());
 
+            if(CollectionUtils.isEmpty(parentIds)){
+                return subjectSelect(null);
+            }
             parents = findBySubjectByIdList(parentIds);
         }