fix：字典管理导入

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicMajorServiceImpl.java

@@ -61,7 +61,6 @@ public class BasicMajorServiceImpl extends ServiceImpl<BasicMajorMapper, BasicMa
         BasicMajor checkName = this.getOne(new QueryWrapper<BasicMajor>().lambda()
                 .eq(BasicMajor::getEnable,true)
                 .eq(BasicMajor::getSchoolId,schoolId)
-                .eq(BasicMajor::getBelongOrgId,collegeId)
                 .eq(BasicMajor::getName,majorName));
         if (Objects.nonNull(checkName) && !checkName.getId().equals(id)){
             throw ExceptionResultEnum.ERROR.exception("专业名称【" + majorName + "】重复");

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

@@ -14,6 +14,7 @@ import com.qmth.teachcloud.common.bean.result.BasicStudentResult;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.*;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
+import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import com.qmth.teachcloud.common.mapper.BasicStudentMapper;
 import com.qmth.teachcloud.common.service.*;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -105,9 +106,9 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
         Map<String, BasicCampus> campusMap = new HashMap<>();
         // key = collegeName
         Map<String, SysOrg> collegeMap = new HashMap<>();
-        // key = collegeId + "-" + majorName
+        // key = schoolId + "-" + majorName
         Map<String, Long> majorMap = new HashMap<>();
-        // key = majorId + "-" + clazzName
+        // key = schoolId + "-" + clazzName
         Map<String, Long> clazzMap = new HashMap<>();
 
         List<BasicStudentParams> addBasicStudentParamsList = new ArrayList<>();
@@ -165,6 +166,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                     } else {
                         sysOrg = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda()
                                 .eq(SysOrg::getSchoolId, schoolId)
+                                .eq(SysOrg::getType, OrgTypeEnum.COLLEGE)
                                 .eq(SysOrg::getName, collegeName));
                         if (Objects.isNull(sysOrg)) {
                             throw ExceptionResultEnum.ERROR.exception("系统中不存在【学院】：" + collegeName);
@@ -180,13 +182,12 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                     if (!SystemConstant.longNotNull(collegeId)) {
                         throw ExceptionResultEnum.ERROR.exception("学生专业信息缺失学院信息异常");
                     }
-                    String majorKey = collegeId + link + majorName;
+                    String majorKey = schoolId + link + majorName;
                     if (majorMap.containsKey(majorKey)) {
                         majorId = majorMap.get(majorKey);
                     } else {
                         BasicMajor basicMajor = basicMajorService.getOne(new QueryWrapper<BasicMajor>().lambda()
                                 .eq(BasicMajor::getSchoolId, schoolId)
-                                .eq(BasicMajor::getBelongOrgId, collegeId)
                                 .eq(BasicMajor::getName, majorName));
                         if (Objects.isNull(basicMajor)) {
                             // 新增一个major
@@ -214,7 +215,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                         throw ExceptionResultEnum.ERROR.exception("学生班级信息缺失专业信息异常");
                     }
 
-                    String clazzKey = majorId + link + clazzName;
+                    String clazzKey = schoolId + link + clazzName;
                     if (clazzMap.containsKey(clazzKey)) {
                         clazzId = clazzMap.get(clazzKey);
                     } else {