Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/GradeServiceImpl.java

@@ -175,14 +175,13 @@ public class GradeServiceImpl implements GradeService{
         }
         sysClazz.setClazz_status(1);
         SysGrade gradeData = sysGradeMapper.selectByPrimaryKey(sysClazz.getGrade_id());
-        String clazz_grade = gradeData.getGrade_name();
-        if(sysClazzMapper.countClazz(sysClazz.getClazz_name(),clazz_grade ) >0 ){
+        if(sysClazzMapper.countClazz(sysClazz.getClazz_name(),gradeData.getGrade_name(),gradeData.getSchool_id() ) >0 ){
             throw new BizException(BizExceptionCode.REPEAT_CLASS_NAME);
         }
 
         sysClazz.setSchool_id(gradeData.getSchool_id());
-        sysClazz.setClazz_grade(clazz_grade);
-        sysClazz.setClazz_nickname(clazz_grade+sysClazz.getClazz_name());
+        sysClazz.setClazz_grade(gradeData.getGrade_name());
+        sysClazz.setClazz_nickname(gradeData.getGrade_name()+sysClazz.getClazz_name());
         sysClazzMapper.insertSelective(sysClazz);
         return new DocBaseDTO(sysClazz.getClazz_id());
     }