@@ -65,7 +65,9 @@ public class SubjectController extends BaseController {
pageInfo.getRows().forEach(row -> {
- row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
+ if(row.getParentSubjectId() != null && row.getParentSubjectId() > 0) {
+ row.setParentSubjectName(map.get(row.getParentSubjectId()).getName());
+ }
});