Преглед изворни кода

fix:字典班级在全校唯一

caozixuan пре 3 година
родитељ
комит
2e1c84f8c3

+ 1 - 3
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicClazzServiceImpl.java

@@ -244,11 +244,9 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
                 throw ExceptionResultEnum.ERROR.exception("所选专业不存在");
             }
 
-            // 检验班级名称在学校的唯一性
+            // 检验班级名称在学校的唯一性(字典班级在全校唯一)
             BasicClazz checkName = this.getOne(new QueryWrapper<BasicClazz>().lambda()
                     .eq(BasicClazz::getSchoolId, schoolId)
-                    .eq(BasicClazz::getMajorId, majorId)
-                    .eq(BasicClazz::getEnable, true)
                     .eq(BasicClazz::getClazzName, clazzName));
             if (Objects.nonNull(checkName)) {
                 if (!checkName.getId().equals(id)) {

+ 1 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicStudentServiceImpl.java

@@ -259,6 +259,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                     if (clazzMap.containsKey(clazzKey)) {
                         clazzId = clazzMap.get(clazzKey);
                     } else {
+                        // 2022-03-30 字典班级在全校唯一
                         BasicClazz basicClazz = basicClazzService.getOne(new QueryWrapper<BasicClazz>().lambda()
                                 .eq(BasicClazz::getSchoolId, schoolId)
                                 .eq(BasicClazz::getClazzName, clazzName));