diff --git a/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java b/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java index 02fc6bf..d5d8380 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/ISendUserBaseService.java @@ -20,6 +20,8 @@ public interface ISendUserBaseService { void editGroup(Integer id,String name,Integer parentId,Integer sort, NodeType type,Integer schId); + void deleteGroup(Integer id,Integer schId); + BoaUser addTeacher(SchTeacher teacher, String pwd, Integer groupId); BoaUser editTeacher(SchTeacher teacher,String pwd, Integer groupId); diff --git a/src/main/java/com/yunhai/bschclassmanage/service/impl/classes/SchClassInfoService.java b/src/main/java/com/yunhai/bschclassmanage/service/impl/classes/SchClassInfoService.java index e423b64..2290014 100644 --- a/src/main/java/com/yunhai/bschclassmanage/service/impl/classes/SchClassInfoService.java +++ b/src/main/java/com/yunhai/bschclassmanage/service/impl/classes/SchClassInfoService.java @@ -95,7 +95,7 @@ public class SchClassInfoService { //获取年级组 List gradeGroupList = comSchTreeService.getSchGroupTypeList(schId, NodeType.GRADE.getId()).get(schsystemId); - if (gradeGroupList != null) { + if (gradeGroupList == null) { BoaGroup academicGroup= sendUserBaseService.addGroup(year.toString(),parentId,year,NodeType.GRADE,schId); parentId=academicGroup.getId(); }else { @@ -220,7 +220,7 @@ public class SchClassInfoService { // if (count > 0) throw new DException("班级下还有学生"); schClassRepository.deleteById(id); cacheService.clearClassCache(schId); - + sendUserBaseService.deleteGroup(id, schId); String content = logService.buildDeleteClassLog(schId, schClass); LogContextHolder.setDescription(content); }