3.2.7 bug修改

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamStudentMapper.java

@@ -7,6 +7,7 @@ import com.qmth.distributed.print.business.bean.dto.ExamStudentPdfInfoDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.teachcloud.common.entity.BasicCollege;
+import com.qmth.teachcloud.common.entity.SysOrg;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -45,7 +46,7 @@ public interface ExamStudentMapper extends BaseMapper<ExamStudent> {
      */
     List<ExamStudent> listExamStudentBySchoolIdAndClazzId(@Param("schoolId") Long schoolId, @Param("classId") String classId);
 
-    List<BasicCollege> getBasicCollegeByBelongOrgId(@Param("studentCode") String studentCode, @Param("schoolId") Long schoolId);
+    List<SysOrg> getBasicCollegeByBelongOrgId(@Param("studentCode") String studentCode, @Param("schoolId") Long schoolId);
 
     ExamStudentPdfInfoDto getByStudentId(Long id);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamStudentService.java

@@ -7,6 +7,7 @@ import com.qmth.distributed.print.business.bean.dto.ExamStudentPdfInfoDto;
 import com.qmth.distributed.print.business.bean.dto.SyncExamStudentDto;
 import com.qmth.distributed.print.business.entity.ExamStudent;
 import com.qmth.teachcloud.common.entity.BasicCollege;
+import com.qmth.teachcloud.common.entity.SysOrg;
 
 import java.util.List;
 import java.util.Map;
@@ -38,7 +39,7 @@ public interface ExamStudentService extends IService<ExamStudent> {
 
     List<ExamStudent> listExamStudentBySchoolIdAndClazzId(Long schoolId, String classId);
 
-    BasicCollege getBasicCollegeByBelongOrgId(String studentCode, Long schoolId);
+    SysOrg getBasicCollegeByBelongOrgId(String studentCode, Long schoolId);
 
     ExamStudentPdfInfoDto getByStudentId(Long id);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/CloudUserPushStatusServiceImpl.java

@@ -35,7 +35,7 @@ public class CloudUserPushStatusServiceImpl extends ServiceImpl<CloudUserPushSta
 
         if (cloudUserPushStatusList != null) {
             if (cloudUserPushStatusList.size() > 1) {
-                throw ExceptionResultEnum.ERROR.exception("异常:用户id【" + userId + "】在云阅卷用户推送状态表中有多条数据");
+                throw ExceptionResultEnum.ERROR.exception("用户id[" + userId + "]在云阅卷用户推送状态表中有多条数据");
             } else if (cloudUserPushStatusList.size() == 1) {
                 result = cloudUserPushStatusList.get(0);
             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DataSyncServiceImpl.java

@@ -19,7 +19,6 @@ import com.qmth.teachcloud.common.bean.dto.stmms.QuestionDTO;
 import com.qmth.teachcloud.common.config.DictionaryConfig;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
-import com.qmth.teachcloud.common.entity.BasicCollege;
 import com.qmth.teachcloud.common.entity.SysOrg;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.*;
@@ -740,8 +739,8 @@ public class DataSyncServiceImpl implements DataSyncService {
                 String name = examStudent.getStudentName();
                 String college = examStudent.getCollegeName();
                 if (StringUtils.isBlank(college)) {
-                    BasicCollege basicCollege = examStudentService.getBasicCollegeByBelongOrgId(studentCode, schoolId);
-                    college = Objects.nonNull(basicCollege) && StringUtils.isNotBlank(basicCollege.getCollegeName()) ? basicCollege.getCollegeName() : "无";
+                    SysOrg sysOrg = examStudentService.getBasicCollegeByBelongOrgId(studentCode, schoolId);
+                    college = Objects.nonNull(sysOrg) && StringUtils.isNotBlank(sysOrg.getName()) ? sysOrg.getName() : "无";
                 }
                 String className = StringUtils.isBlank(examStudent.getClazzName()) ? getClassName(examStudent.getExtendFields()) : examStudent.getClazzName();
                 String teacher = "无";

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DownloadServiceImpl.java

@@ -270,7 +270,7 @@ public class DownloadServiceImpl implements DownloadService {
                     } else if (unexposedPaperTypeList.contains(paperType)) {
                         exposureStatus = false;
                     } else {
-                        throw ExceptionResultEnum.ERROR.exception("命题任务曝光卷型异常【" + examTaskId + "(" + paperType + ")】");
+                        throw ExceptionResultEnum.ERROR.exception("命题任务曝光卷型异常[" + examTaskId + "(" + paperType + ")]");
                     }
 
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamDetailServiceImpl.java

@@ -1165,7 +1165,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
                 .eq(ExamDetail::getId, entityId);
         this.update(examDetailUpdateWrapper);
 
-        // 清掉考场-课程表中关联的试卷编号
+        // 清掉考场-课程表中关联的试卷类型
         List<ExamDetailCourse> examDetailCourseList = examDetailCourseService.listByExamDetailId(entityId);
         if (!CollectionUtils.isEmpty(examDetailCourseList)) {
             for (ExamDetailCourse examDetailCourse : examDetailCourseList) {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamStudentServiceImpl.java

@@ -14,6 +14,7 @@ import com.qmth.distributed.print.business.mapper.ExamDetailCourseMapper;
 import com.qmth.distributed.print.business.mapper.ExamStudentMapper;
 import com.qmth.distributed.print.business.service.ExamStudentService;
 import com.qmth.teachcloud.common.entity.BasicCollege;
+import com.qmth.teachcloud.common.entity.SysOrg;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -89,8 +90,8 @@ public class ExamStudentServiceImpl extends ServiceImpl<ExamStudentMapper, ExamS
     }
 
     @Override
-    public BasicCollege getBasicCollegeByBelongOrgId(String studentCode, Long schoolId) {
-        List<BasicCollege> basicCollegeList = this.baseMapper.getBasicCollegeByBelongOrgId(studentCode, schoolId);
+    public SysOrg getBasicCollegeByBelongOrgId(String studentCode, Long schoolId) {
+        List<SysOrg> basicCollegeList = this.baseMapper.getBasicCollegeByBelongOrgId(studentCode, schoolId);
         if (!CollectionUtils.isEmpty(basicCollegeList)) {
             return basicCollegeList.get(0);
         }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskDetailServiceImpl.java

@@ -778,16 +778,16 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
                 Map<String, String> newPaperAttachmentIdMap = newPaperAttachmentIdsList.stream().collect(Collectors.toMap(m -> m.get("name").toString(), m -> m.get("attachmentId").toString()));
                 for (String paperType : exposedPaperTypes) {
                     if (!oldPaperAttachmentIdMap.containsKey(paperType)) {
-                        throw ExceptionResultEnum.ERROR.exception("原试卷卷型【" + paperType + "】不存在");
+                        throw ExceptionResultEnum.ERROR.exception("原试卷卷型[" + paperType + "]不存在");
                     }
                     if (!newPaperAttachmentIdMap.containsKey(paperType)) {
-                        throw ExceptionResultEnum.ERROR.exception("已曝光卷型【" + paperType + "】不能删除");
+                        throw ExceptionResultEnum.ERROR.exception("已曝光卷型[" + paperType + "]不能删除");
                     }
 
                     String newAttachmentId = newPaperAttachmentIdMap.get(paperType);
                     String oldAttachmentId = oldPaperAttachmentIdMap.get(paperType);
                     if (!newAttachmentId.equals(oldAttachmentId)) {
-                        throw ExceptionResultEnum.ERROR.exception("已曝光卷型【" + paperType + "】不能修改试卷文件");
+                        throw ExceptionResultEnum.ERROR.exception("已曝光卷型[" + paperType + "]不能修改试卷文件");
                     }
                 }
             }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskPrintServiceImpl.java

@@ -112,11 +112,11 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
             // 如果该用户创建了任意教学课程，则走教学课程查询逻辑
             List<TeachCourse> teachCourseList = teachCourseDatasource.stream().filter(e -> basicCourseService.getById(e.getBasicCourseId()).getCode().equals(courseCode)).collect(Collectors.toList());
             if (teachCourseList.size() > 1) {
-                throw ExceptionResultEnum.ERROR.exception("基础信息管理中【" + basicCourse.getName() + "】教学课程信息存在多条数据异常");
+                throw ExceptionResultEnum.ERROR.exception("基础信息管理中[" + basicCourse.getName() + "]教学课程信息存在多条数据异常");
             }
             if (teachCourseList.size() == 0) {
                 // 没创建该教学课程
-                throw ExceptionResultEnum.ERROR.exception("请优先在基础信息管理中创建【" + basicCourse.getName() + "】的教学课程信息");
+                throw ExceptionResultEnum.ERROR.exception("请优先在基础信息管理中创建[" + basicCourse.getName() + "]的教学课程信息");
             }
             TeachCourse teachCourse = teachCourseList.get(0);
             List<TeachClazz> teachClazzList = teachClazzService.list(new QueryWrapper<TeachClazz>().lambda().in(TeachClazz::getBasicCourseId, teachCourse.getBasicCourseId()));

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -1400,7 +1400,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         int count = examDetailList.getStudentCount();
                         String clazzName = examDetailList.getClassName();
                         if (count == 0) {
-                            throw ExceptionResultEnum.ERROR.exception("选择的考试班级【" + clazzName + "】下无学生，请确认该班级学生信息");
+                            throw ExceptionResultEnum.ERROR.exception("选择的考试班级[" + clazzName + "]下无学生，请确认该班级学生信息");
                         }
 
                         if (!CollectionUtils.isEmpty(classIdSet)) {
@@ -1783,6 +1783,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     LinkedMultiValueMap<Long, StudentInfo> studentInfoLinkedMultiValueMap = new LinkedMultiValueMap<>();
                     Map<Long, ExamTaskStudentObjectResult> examTaskStudentObjectResultMap = new LinkedHashMap<>();
                     for (BasicStudentResult e : basicStudentResultList) {
+                        // 没有班级的考生，不返回
+                        if(StringUtils.isBlank(e.getClazz())){
+                            continue;
+                        }
                         StudentInfo studentInfo = new StudentInfo();
                         studentInfo.setStudentId(e.getId());
                         studentInfo.setStudentCode(e.getStudentCode());
@@ -1848,7 +1852,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     // 检验学号
                     if (SystemConstant.strNotNull(studentCode)) {
                         if (checkCodeMap.containsKey(studentCode)) {
-                            throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【学生编号】：" + studentCode);
+                            throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的学生编号[" + studentCode+"]");
                         } else {
                             checkCodeMap.put(studentCode, studentName);
                         }
@@ -1856,7 +1860,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     // 如果电话有值则检验电话excel中唯一性
                     if (SystemConstant.strNotNull(phoneNumber)) {
                         if (checkPhoneMap.containsKey(phoneNumber)) {
-                            throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【电话号码】：" + phoneNumber);
+                            throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的电话号码[" + phoneNumber+"]");
                         } else {
                             checkPhoneMap.put(phoneNumber, studentCode);
                         }
@@ -1905,20 +1909,20 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
             // 学院核对
             if (!impCollegeName.equals(realityCollegeName)) {
-                throw ExceptionResultEnum.ERROR.exception("导入的考生【" + studentName + "(" + studentCode + ")】所在学院【" + impCollegeName +
-                        "】与该考生实际所在学院【" + realityCollegeName + "】不符，请检验excel数据是否异常或联系管理员核对");
+                throw ExceptionResultEnum.ERROR.exception("导入的考生[" + studentName + "(" + studentCode + ")]所在学院[" + impCollegeName +
+                        "]与该考生实际所在学院[" + realityCollegeName + "]不符，请检验excel数据是否异常或联系管理员核对");
             }
 
             // 专业核对
             if (!impMajorName.equals(realityMajorName)) {
-                throw ExceptionResultEnum.ERROR.exception("导入的考生【" + studentName + "(" + studentCode + ")】所在专业【" + impMajorName +
-                        "】与该考生实际所在专业【" + realityMajorName + "】不符，请检验excel数据是否异常或联系管理员核对");
+                throw ExceptionResultEnum.ERROR.exception("导入的考生[" + studentName + "(" + studentCode + ")]所在专业[" + impMajorName +
+                        "]与该考生实际所在专业[" + realityMajorName + "]不符，请检验excel数据是否异常或联系管理员核对");
             }
 
             // 班级核对
             if (!impClazzName.equals(realityClazzName)) {
-                throw ExceptionResultEnum.ERROR.exception("导入的考生【" + studentName + "(" + studentCode + ")】所在班级【" + impClazzName +
-                        "】与该考生实际所在班级【" + realityClazzName + "】不符，请检验excel数据是否异常或联系管理员核对");
+                throw ExceptionResultEnum.ERROR.exception("导入的考生[" + studentName + "(" + studentCode + ")]所在班级[" + impClazzName +
+                        "]与该考生实际所在班级[" + realityClazzName + "]不符，请检验excel数据是否异常或联系管理员核对");
             }
         }
         // 去掉已存在的学生集合

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -105,7 +105,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
                         .eq(TeachCourse::getSchoolId, schoolId)
                         .eq(TeachCourse::getUserId, userId)
                         .eq(TeachCourse::getBasicCourseId, basicCourseId)) > 0) {
-                    throw ExceptionResultEnum.ERROR.exception("课程【" + courseName + "】已经创建");
+                    throw ExceptionResultEnum.ERROR.exception("课程[" + courseName + "]已经创建");
                 }
             }
         } else {
@@ -237,7 +237,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
         if (Objects.nonNull(dbUser)) {
             if (!name.equals(dbUser.getRealName())) {
                 // 用户名称不一致
-                throw ExceptionResultEnum.ERROR.exception("工号为【" + code + "】的教师用户名称错误");
+                throw ExceptionResultEnum.ERROR.exception("工号[" + code + "]的教师用户名称错误");
             } else {
                 teacherId = dbUser.getId();
                 // 判断在该教师团队下已经存在该教师
@@ -246,7 +246,7 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
                         .eq(TeachCourse::getSchoolId, schoolId)
                         .eq(TeachCourse::getBasicCourseId, basicCourseId)
                         .eq(TeachCourse::getUserId, teacherId)) > 0) {
-                    throw ExceptionResultEnum.ERROR.exception("教师【" + name + "】已经在教师团队中");
+                    throw ExceptionResultEnum.ERROR.exception("教师[" + name + "]已经在教师团队中");
                 }
             }
         } else {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachStudentServiceImpl.java

@@ -63,10 +63,10 @@ public class TeachStudentServiceImpl extends ServiceImpl<TeachStudentMapper, Tea
                 .eq(BasicStudent::getStudentCode, studentCode)
                 .eq(BasicStudent::getStudentName, studentName));
         if (Objects.isNull(basicStudent)) {
-            throw ExceptionResultEnum.ERROR.exception("学生姓名为【" + studentName + "】学号为【" + studentCode + "】的学生在学生字典中不存在，请先创建该学生字典");
+            throw ExceptionResultEnum.ERROR.exception("学生姓名[" + studentName + "]，学号[" + studentCode + "]的学生在学生管理中不存在，请先创建该学生");
         }
         if (this.checkTeachStudentRepeat(basicStudent.getId(), teachClazzId, schoolId)) {
-            throw ExceptionResultEnum.ERROR.exception("学生姓名为【" + studentName + "】学号为【" + studentCode + "】的学生在该班级已存在");
+            throw ExceptionResultEnum.ERROR.exception("学生姓名[" + studentName + "]，学号为[" + studentCode + "]的学生在该班级已存在");
         }
         List<BasicStudent> basicStudentList = new ArrayList<>();
         basicStudentList.add(basicStudent);
@@ -124,9 +124,9 @@ public class TeachStudentServiceImpl extends ServiceImpl<TeachStudentMapper, Tea
                 .collect(Collectors.joining(","));
 
         this.createTeachStudentBatch(basicStudentList, teachClazzId, schoolId, requestUser);
-        String success = "【" + basicStudentList.size() + "】个学生导入成功";
+        String success = "[" + basicStudentList.size() + "]个学生导入成功";
         if (SystemConstant.strNotNull(basicStudentNotFoundStr)){
-            success = success + "，且学号为【" + basicStudentNotFoundStr + "】的学生在字典中不存在没有导入";
+            success = success + "，且学号[" + basicStudentNotFoundStr + "]的学生在字典中不存在没有导入";
         }
         return success;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1597,7 +1597,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     // 检验excel中
                     // 检验学号
                     if (checkNameMap.containsKey(clazzName)) {
-                        throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的【班级名称】：" + clazzName);
+                        throw ExceptionResultEnum.ERROR.exception("导入的excel中包含在重复的班级名称[" + clazzName + "]");
                     } else {
                         checkNameMap.put(clazzName, clazzName);
                     }

distributed-print-business/src/main/resources/mapper/ExamStudentMapper.xml

@@ -180,12 +180,12 @@
         </where>
         ) t0;
     </select>
-    <select id="getBasicCollegeByBelongOrgId" resultType="com.qmth.teachcloud.common.entity.BasicCollege">
+    <select id="getBasicCollegeByBelongOrgId" resultType="com.qmth.teachcloud.common.entity.SysOrg">
         SELECT bc.id,
-               bc.college_name
+               bc.name
         FROM basic_student bs
                  LEFT JOIN
-             basic_college bc ON bs.belong_org_id = bc.id
+             sys_org bc ON bs.belong_org_id = bc.id
         WHERE bs.student_code = #{studentCode}
           and bs.school_id = #{schoolId}
     </select>

distributed-print-business/src/main/resources/mapper/TeachStudentMapper.xml

@@ -8,7 +8,7 @@
             ts.id AS id,
             bs.student_name AS studentName,
             bs.student_code AS studentCode,
-            bce.college_name AS belongOrgName,
+            so.name AS belongOrgName,
             bm.name AS majorName,
             bc.clazz_name AS clazzName
         FROM
@@ -16,7 +16,7 @@
                 LEFT JOIN
             basic_student bs ON ts.student_id = bs.id
                 LEFT JOIN
-            basic_college bce ON bs.belong_org_id = bce.id
+            sys_org so ON bs.belong_org_id = so.id
                 LEFT JOIN
             basic_major bm ON bs.major_id = bm.id
                 LEFT JOIN

distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCourseController.java

@@ -105,9 +105,9 @@ public class BasicCourseController {
         }
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long l = basicCourseService.saveBasicCourse(basicCourseParams, sysUser);
-        if (!CollectionUtils.isEmpty(basicCourseParams.getTeachIdSet())) {
-            teachCourseService.updateByCourseIdAndTeacherList(basicCourseParams.getId(), basicCourseParams.getTeachIdSet());
-        }
+//        if (!CollectionUtils.isEmpty(basicCourseParams.getTeachIdSet())) {
+//            teachCourseService.updateByCourseIdAndTeacherList(basicCourseParams.getId(), basicCourseParams.getTeachIdSet());
+//        }
         return ResultUtil.ok(l);
     }
 
@@ -122,8 +122,8 @@ public class BasicCourseController {
     @ApiOperation(value = "课程管理-根据查询条件批量删除")
     @RequestMapping(value = "/delete_by_query", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "删除成功", response = EditResult.class)})
-    @OperationLogDetail(detail = "根据查询条件【所属机构id[{{belongOrgId}}],课程名称（模糊查询）[{{courseName}}],创建时间（起始位置）[{{startCreateTime}}]," +
-            "创建时间（终止位置）[{{endCreateTime}}],状态[{{enable}}],启用&禁用操作[{{enableOperate}}]】批量启用/禁用课程", level = LevelEnum.TERTIARY, operationType = OperationTypeEnum.EDIT, customizedOperationType = CustomizedOperationTypeEnum.DELETE)
+    @OperationLogDetail(detail = "根据查询条件[所属机构id[{{belongOrgId}}],课程名称（模糊查询）[{{courseName}}],创建时间（起始位置）[{{startCreateTime}}]," +
+            "创建时间（终止位置）[{{endCreateTime}}],状态[{{enable}}],启用&禁用操作[{{enableOperate}}]]批量启用/禁用课程", level = LevelEnum.TERTIARY, operationType = OperationTypeEnum.EDIT, customizedOperationType = CustomizedOperationTypeEnum.DELETE)
     public Result enableBasicCourseByQuery(@ApiParam(value = "所属机构id") @RequestParam(required = false) String belongOrgId,
                                            @ApiParam(value = "课程名称（模糊查询）") @RequestParam(required = false) String courseName,
                                            @ApiParam(value = "创建时间（起始位置）") @RequestParam(required = false) String startCreateTime,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/SysRoleService.java

@@ -56,5 +56,5 @@ public interface SysRoleService extends IService<SysRole> {
 
     boolean builtin(Long id, boolean defaultRole);
 
-    List<SysRole> getByRoleName(String roleName);
+    List<SysRole> getByRoleName(Long schoolId, String roleName);
 }

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

@@ -59,11 +59,11 @@ public class BasicCampusServiceImpl extends ServiceImpl<BasicCampusMapper, Basic
         }
         BasicCampus checkName = this.getOne(new QueryWrapper<BasicCampus>().lambda().eq(BasicCampus::getEnable,true).eq(BasicCampus::getSchoolId,schoolId).eq(BasicCampus::getCampusName,campusName));
         if (Objects.nonNull(checkName) && !checkName.getId().equals(campusId)){
-            throw ExceptionResultEnum.ERROR.exception("校区名称【" + campusName + "】重复");
+            throw ExceptionResultEnum.ERROR.exception("校区名称[" + campusName + "]重复");
         }
         BasicCampus checkCode = this.getOne(new QueryWrapper<BasicCampus>().lambda().eq(BasicCampus::getEnable,true).eq(BasicCampus::getSchoolId,schoolId).eq(BasicCampus::getCampusCode,campusCode));
         if (Objects.nonNull(checkCode) && !checkCode.getId().equals(campusId)){
-            throw ExceptionResultEnum.ERROR.exception("校区编号【" + campusCode + "】重复");
+            throw ExceptionResultEnum.ERROR.exception("校区编号[" + campusCode + "]重复");
         }
 
         if (SystemConstant.longNotNull(campusId)){

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

@@ -97,7 +97,7 @@ public class BasicClazzServiceImpl extends ServiceImpl<BasicClazzMapper, BasicCl
             String studentClazzName = this.list(new QueryWrapper<BasicClazz>().lambda()
                     .in(BasicClazz::getId, ids)).stream().map(BasicClazz::getClazzName).collect(Collectors.joining(","));
             if (StringUtils.isNotBlank(studentClazzName)) {
-                throw ExceptionResultEnum.ERROR.exception("班级[" + errorStudent + "]绑定了学生，无法删除");
+                throw ExceptionResultEnum.ERROR.exception("班级[" + studentClazzName + "]绑定了学生，无法删除");
             }
         }
 

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

@@ -57,7 +57,7 @@ public class BasicCollegeServiceImpl extends ServiceImpl<BasicCollegeMapper, Bas
         // 检验学院名称一定和二级机构（学院级机构）名称一致 
         List<SysOrg> collegeOrgList = commonCacheService.addOrgCollegeLevelCache(schoolId);
         if (collegeOrgList.stream().noneMatch(e -> collegeName.equals(e.getName()))){
-            throw ExceptionResultEnum.ERROR.exception("学生所在的学院名称【" + collegeName + "】不在学院机构中");
+            throw ExceptionResultEnum.ERROR.exception("学生所在的学院名称[" + collegeName + "]不在学院机构中");
         }
 
         // 校验专业唯一性（名称在学院下）
@@ -65,7 +65,7 @@ public class BasicCollegeServiceImpl extends ServiceImpl<BasicCollegeMapper, Bas
                 .eq(BasicCollege::getSchoolId, schoolId)
                 .eq(BasicCollege::getCollegeName, collegeName));
         if (Objects.nonNull(checkName) && !checkName.getId().equals(id)) {
-            throw ExceptionResultEnum.ERROR.exception("学生学院名称【" + collegeName + "】重复");
+            throw ExceptionResultEnum.ERROR.exception("学生学院名称[" + collegeName + "]重复");
         }
         if (SystemConstant.longNotNull(id)) {
             // 编辑
@@ -105,7 +105,7 @@ public class BasicCollegeServiceImpl extends ServiceImpl<BasicCollegeMapper, Bas
                     .stream()
                     .map(BasicCollege::getCollegeName)
                     .collect(Collectors.joining(","));
-            throw ExceptionResultEnum.ERROR.exception("学生学院【" + collegeNames + "】被专业绑定，无法优先删除");
+            throw ExceptionResultEnum.ERROR.exception("学生学院[" + collegeNames + "]被专业绑定，无法优先删除");
         }
 
         // 判断学生
@@ -116,7 +116,7 @@ public class BasicCollegeServiceImpl extends ServiceImpl<BasicCollegeMapper, Bas
                     .stream()
                     .map(BasicCollege::getCollegeName)
                     .collect(Collectors.joining(","));
-            throw ExceptionResultEnum.ERROR.exception("学生学院【" + collegeNames + "】被学生绑定，无法优先删除");
+            throw ExceptionResultEnum.ERROR.exception("学生学院[" + collegeNames + "]被学生绑定，无法优先删除");
         }
         return this.removeByIds(idList);
     }

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

@@ -86,7 +86,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     public BasicCourse findByCourseCode(String courseCode, Long schoolId) {
         BasicCourse basicCourse = this.getOne(new QueryWrapper<BasicCourse>().lambda().eq(BasicCourse::getCode, courseCode).eq(BasicCourse::getSchoolId, schoolId));
         if (Objects.isNull(basicCourse)) {
-            throw ExceptionResultEnum.ERROR.exception("未找到课程编号为【" + courseCode + "】的基础课程");
+            throw ExceptionResultEnum.ERROR.exception("未找到课程编号为[" + courseCode + "]的基础课程");
         }
         return basicCourse;
     }
@@ -153,6 +153,8 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
         try {
             this.saveOrUpdate(editBasicCourse);
 
+            basicTeachCourseService.updateByCourseIdAndTeacherList(basicCourseParams.getId(), basicCourseParams.getTeachIdSet());
+
             // 同步更新命题任务中的课程名称
             this.baseMapper.updateCourseNameFormExamTask(sysUser.getSchoolId(), editBasicCourse.getCode(), editBasicCourse.getName());
         } catch (Exception e) {
@@ -206,7 +208,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             for (Map<String, Object> map : mapList) {
                 courseNames.append(map.get("courseName")).append(",");
             }
-            throw ExceptionResultEnum.ERROR.exception("课程 ： 【" + courseNames.substring(0, courseNames.length() - 1) + "】 已经生成了命题任务，不允许删除");
+            throw ExceptionResultEnum.ERROR.exception("课程[" + courseNames.substring(0, courseNames.length() - 1) + "]已经生成了命题任务，不允许删除");
         }
         // 课程批量删除
         basicUserCourseService.remove(new QueryWrapper<BasicUserCourse>().lambda()
@@ -244,7 +246,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
 
     @Override
     public List<BasicCourseParams> executeImportBasicCourseLogic(MultipartFile file) throws IOException, NoSuchFieldException {
-        Map<Integer,List<String>> errorMap = new HashMap<>();
+        Map<Integer, List<String>> errorMap = new HashMap<>();
         InputStream inputStream = file.getInputStream();
         List<LinkedMultiValueMap<Integer, Object>> finalList = ExcelUtil.excelReader(inputStream, Lists.newArrayList(BasicCourseImportDto.class, DescribeImportDto.class), (finalExcelList, finalColumnNameList, finalExcelErrorList) -> {
             Map<String, BasicCourseImportDto> courseDtoMap = new HashMap<>();
@@ -276,11 +278,11 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                             String primaryName = primaryCell.getCourseName();
                             String primaryTeachingRoomName = primaryCell.getTeachingRoomName();
                             if (!Objects.equals(primaryName, courseName)) {
-                                String cellException = "【课程编号】 ： " + courseCode + ",存在不同的【课程名称】";
+                                String cellException = "课程编码[" + courseCode + "],存在不同的课程名称";
                                 this.updateErrorInfoMap(errorMap, y + 1, cellException);
                             }
                             if (!Objects.equals(primaryTeachingRoomName, teachingRoomName)) {
-                                String cellException = "【课程编号】 ： " + courseCode + ",存在不同的【所属教研室】";
+                                String cellException = "课程编码[" + courseCode + "],存在不同的开课学院";
                                 this.updateErrorInfoMap(errorMap, y + 1, cellException);
                             }
                             String primaryClazz = primaryCell.getClazz();
@@ -293,19 +295,19 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                             courseDtoMap.put(courseCode, basicCourseImportDto);
                         }
                     }
-                    if (Objects.nonNull(courseCode) && !courseCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {
-                        this.updateErrorInfoMap(errorMap, y + 1, "[课程编号]不符合输入规范");
+                    if (Objects.nonNull(courseCode) && (!courseCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE) || courseCode.length() < 3 || courseCode.length() > 30)) {
+                        this.updateErrorInfoMap(errorMap, y + 1, "课程编码[" + courseCode + "]不符合输入规范");
                     }
                 }
                 // 删除重复的（需要累加的）excel数据
                 basicCourseImportDtoList.removeAll(duplicateData);
             }
             return finalExcelList;
-        },2);
-        return this.executeBasicCourseImportLogic(finalList,errorMap);
+        }, 2);
+        return this.executeBasicCourseImportLogic(finalList, errorMap);
     }
 
-    private void updateErrorInfoMap(Map<Integer,List<String>> errorMap,Integer key,String exception) {
+    private void updateErrorInfoMap(Map<Integer, List<String>> errorMap, Integer key, String exception) {
         if (errorMap.containsKey(key)) {
             errorMap.get(key).add(exception);
         } else {
@@ -326,7 +328,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
         for (Integer rowIndex : exceptionMap.keySet()) {
             String rowInfo;
             if (rowIndex > 0) {
-                rowInfo = "excel中第【" + rowIndex + "】行 : ";
+                rowInfo = "excel中第[" + rowIndex + "]行 : ";
             } else {
                 rowInfo = "excel中存在异常：";
             }
@@ -346,7 +348,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
 
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public List<BasicCourseParams> executeBasicCourseImportLogic(List<LinkedMultiValueMap<Integer, Object>> finalList,Map<Integer,List<String>> errorMap) {
+    public List<BasicCourseParams> executeBasicCourseImportLogic(List<LinkedMultiValueMap<Integer, Object>> finalList, Map<Integer, List<String>> errorMap) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long schoolId = sysUser.getSchoolId();
         List<BasicCourseParams> addBasicCourseParamsList = new ArrayList<>();
@@ -367,7 +369,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                         .eq(SysOrg::getEnable, true)
                         .eq(SysOrg::getName, teachingRoomName));
                 if (Objects.isNull(sysOrg)) {
-                    this.updateErrorInfoMap(errorMap,rowIndex,"输入的开课学院【" + teachingRoomName + "】不存在");
+                    this.updateErrorInfoMap(errorMap, rowIndex, "输入的开课学院[" + teachingRoomName + "]不存在");
                     continue;
                 }
                 Long teachingRoomId = sysOrg.getId();
@@ -380,7 +382,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                                 .eq(BasicClazz::getSchoolId, schoolId)
                                 .eq(BasicClazz::getClazzName, clzName));
                         if (Objects.isNull(basicClazz)) {
-                            this.updateErrorInfoMap(errorMap,rowIndex,"所选择【班级】" + clzName + "不存在");
+                            this.updateErrorInfoMap(errorMap, rowIndex, "所选择班级[" + clzName + "]不存在");
                             continue;
                         }
                         clazzIdSet.add(basicClazz.getId());
@@ -405,14 +407,14 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                                 .eq(SysUser::getRealName, name)
                                 .eq(SysUser::getCode, code));
                         if (Objects.isNull(sysUserDb)) {
-                            this.updateErrorInfoMap(errorMap, rowIndex, "【姓名】" + name + ",【工号】" + code + "不存在");
+                            this.updateErrorInfoMap(errorMap, rowIndex, "姓名[" + name + "],工号[" + code + "]不存在");
                             continue;
                         }
 
                         List<SysRole> sysRoleList = sysUserRoleService.listRoleByUserId(sysUserDb.getId());
                         sysRoleList = sysRoleList.stream().filter(s -> s.getType() == RoleTypeEnum.SCHOOL_TEACHER).collect(Collectors.toList());
                         if (CollectionUtils.isEmpty(sysRoleList)) {
-                            this.updateErrorInfoMap(errorMap, rowIndex, "【姓名】" + name + "，【工号】" + code + "没有老师角色");
+                            this.updateErrorInfoMap(errorMap, rowIndex, "姓名[" + name + "]，工号[" + code + "]没有老师角色");
                             continue;
                         }
                         teachIdSet.add(sysUserDb.getId());
@@ -575,7 +577,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                     .eq(BasicCourse::getEnable, true));
             if (Objects.nonNull(checkCode)) {
                 if (!checkCode.getId().equals(id)) {
-                    throw ExceptionResultEnum.ERROR.exception("课程编号【" + courseCode + "】重复");
+                    throw ExceptionResultEnum.ERROR.exception("课程编码[" + courseCode + "]重复");
                 }
             }
             // 校验教研室id

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

@@ -403,8 +403,8 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
                     .eq(BasicStudent::getSchoolId, schoolId)
                     .eq(BasicStudent::getPhoneNumber, phoneNumber));
             if (Objects.nonNull(checkPhone)) {
-                if (!checkPhone.getStudentCode().equals(studentCode)) {
-                    throw ExceptionResultEnum.ERROR.exception("电话[" + phoneNumber + "]绑定了不同学号");
+                if ((basicStudentParams.getId() != null && !checkPhone.getId().equals(basicStudentParams.getId())) || basicStudentParams.getId() == null) {
+                    throw ExceptionResultEnum.ERROR.exception("电话[" + phoneNumber + "]已使用");
                 }
             }
         }
@@ -418,7 +418,7 @@ public class BasicStudentServiceImpl extends ServiceImpl<BasicStudentMapper, Bas
         basicStudent.setMajorId(majorId);
         basicStudent.setClazzId(clazzId);
         basicStudent.setSchoolId(schoolId);
-        basicStudent.setOrgId(collegeId);
+        basicStudent.setOrgId(sysUser.getOrgId());
 
         if (basicStudentParams.getId() != null) {
             if (!studentCode.matches(SystemConstant.REGULAR_EXPRESSION_OF_CODE)) {

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

@@ -707,8 +707,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
             if (SystemConstant.isOneNull(p1, p2)) {
                 throw ExceptionResultEnum.ERROR.exception("未找到父机构");
             }
-            throw ExceptionResultEnum.ERROR.exception("机构创建失败：机构【" + orgName + "】存在多个不同的上级机构 " +
-                    "-> 已存在机构关系【..." + p1.getName() + SystemConstant.ORG_SPLIT + orgName + "...】，却又创建机构关系【..." + p2.getName() + SystemConstant.ORG_SPLIT + orgName + "...】");
+            throw ExceptionResultEnum.ERROR.exception("机构创建失败：机构[" + orgName + "]存在多个不同的上级机构 " +
+                    "-> 已存在机构关系[..." + p1.getName() + SystemConstant.ORG_SPLIT + orgName + "...]，却又创建机构关系[..." + p2.getName() + SystemConstant.ORG_SPLIT + orgName + "...]");
         }
 
         SysOrg sysOrg = new SysOrg();

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

@@ -189,7 +189,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                     .collect(Collectors.toList());
             String roleName = role.getName();
             if (defaultRoleNames.contains(roleName)) {
-                throw ExceptionResultEnum.ERROR.exception("自定义角色名称不能和系统默认角色【" + roleName + "】同名");
+                throw ExceptionResultEnum.ERROR.exception("自定义角色名称不能和系统默认角色[" + roleName + "]同名");
             }
             if (Objects.nonNull(role.getId())) {//编辑
                 List<SysRolePrivilege> sysRolePrivilegeList = commonCacheService.rolePrivilegeCache(role.getId());
@@ -392,8 +392,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     }
 
     @Override
-    public List<SysRole> getByRoleName(String roleName) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+    public List<SysRole> getByRoleName(Long schoolId, String roleName) {
         return this.baseMapper.getByRoleName(schoolId, roleName);
     }
 }

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

@@ -233,7 +233,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUser checkMobileNumber = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, sysUser.getSchoolId()).eq(SysUser::getEnable, true).eq(SysUser::getMobileNumber, mobileNumber));
             if (Objects.nonNull(checkMobileNumber)) {
                 if (!checkMobileNumber.getId().equals(sysUser.getId())) {
-                    throw ExceptionResultEnum.ERROR.exception("用户手机号【" + mobileNumber + "】重复");
+                    throw ExceptionResultEnum.ERROR.exception("用户手机号[" + mobileNumber + "]重复");
                 }
             }
 
@@ -529,7 +529,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUser checkCode = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getCode, code));
             if (Objects.nonNull(checkCode)) {
                 if (!checkCode.getId().equals(userSaveParams.getId())) {
-                    throw ExceptionResultEnum.ERROR.exception("用户工号【" + code + "】重复");
+                    throw ExceptionResultEnum.ERROR.exception("用户工号[" + code + "]重复");
                 }
             }
             // 手机号检验
@@ -537,7 +537,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 SysUser checkMobileNumber = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getMobileNumber, mobileNumber));
                 if (Objects.nonNull(checkMobileNumber)) {
                     if (!checkMobileNumber.getId().equals(userSaveParams.getId())) {
-                        throw ExceptionResultEnum.ERROR.exception("用户手机号【" + mobileNumber + "】重复");
+                        throw ExceptionResultEnum.ERROR.exception("用户手机号[" + mobileNumber + "]重复");
                     }
                 }
             }
@@ -1222,7 +1222,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUser checkCode = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getCode, code));
             if (Objects.nonNull(checkCode)) {
                 if (!checkCode.getId().equals(userSaveParams.getId())) {
-                    throw ExceptionResultEnum.ERROR.exception("用户工号【" + code + "】重复");
+                    throw ExceptionResultEnum.ERROR.exception("用户工号[" + code + "]重复");
                 }
             }
             // 手机号检验
@@ -1230,7 +1230,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                 SysUser checkMobileNumber = this.getOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getSchoolId, schoolId).eq(SysUser::getEnable, true).eq(SysUser::getMobileNumber, mobileNumber));
                 if (Objects.nonNull(checkMobileNumber)) {
                     if (!checkMobileNumber.getId().equals(userSaveParams.getId())) {
-                        throw ExceptionResultEnum.ERROR.exception("用户手机号【" + mobileNumber + "】重复");
+                        throw ExceptionResultEnum.ERROR.exception("用户手机号[" + mobileNumber + "]重复");
                     }
                 }
             }
@@ -1288,7 +1288,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     private Long analyzeOrgName(Long schoolId, String orgName) {
         SysOrg sysOrg = sysOrgService.getOne(new QueryWrapper<SysOrg>().lambda().eq(SysOrg::getEnable, true).eq(SysOrg::getSchoolId, schoolId).eq(SysOrg::getName, orgName));
         if (Objects.isNull(sysOrg)) {
-            throw ExceptionResultEnum.ERROR.exception("系统中不存在excel导入的机构【" + orgName + "】");
+            throw ExceptionResultEnum.ERROR.exception("系统中不存在excel导入的机构[" + orgName + "]");
         }
         return sysOrg.getId();
     }
@@ -1305,7 +1305,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String[] arr = roleNames.split(SystemConstant.COMMA);
         for (String cell : arr) {
             String roleName = cell.trim();
-            List<SysRole> sysRoles = sysRoleService.getByRoleName(roleName);
+            List<SysRole> sysRoles = sysRoleService.getByRoleName(schoolId, roleName);
             if (CollectionUtils.isEmpty(sysRoles)) {
                 throw ExceptionResultEnum.ERROR.exception("角色[" + roleName + "]不存在");
             } else if (sysRoles.size() > 1) {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ConvertUtil.java

@@ -69,12 +69,12 @@ public class ConvertUtil {
         String[] arr = time.split(SystemConstant.HYPHEN);
         if (arr.length != 2) {
             // 不能使用'-'拆分成两个时间的报错
-            throw ExceptionResultEnum.ERROR.exception("提供的时间格式异常 【考试时间】:" + time + " 应该使用如下的格式【考试时间】:18:00-20:00");
+            throw ExceptionResultEnum.ERROR.exception("提供的时间格式异常，考试时间[" + time + "]应该使用如下的格式（考试时间:18:00-20:00）");
         }
         String startTimeStr = date + " " + arr[0];
         String endTimeStr = date + " " + arr[1];
         if (Objects.isNull(DateDisposeUtils.parseDate(startTimeStr)) || Objects.isNull(DateDisposeUtils.parseDate(endTimeStr))) {
-            throw ExceptionResultEnum.ERROR.exception("提供的日期时间格式异常 \n【考试日期】:" + date + " 应该使用如下的格式【考试日期】:2021-09-01 或 2021/09/01 或 2021.09.01" + "\n【考试时间】:" + time + " 应该使用如下的格式【考试时间】:18:00-20:00");
+            throw ExceptionResultEnum.ERROR.exception("提供的日期时间格式异常 \n考试日期[" + date + "]应该使用如下的格式（考试日期:2021-09-01 或 2021/09/01 或 2021.09.01）" + "\n考试时间[" + time + "]应该使用如下的格式（考试时间:18:00-20:00）");
         }
         long startTime = DateDisposeUtils.parseDate(startTimeStr).getTime();
         long endTime = DateDisposeUtils.parseDate(endTimeStr).getTime();

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ExcelUtil.java

@@ -184,7 +184,7 @@ public class ExcelUtil {
                         }
                         ExcelImportTempleteVaild excelImportTempleteVaild = o.getClass().getDeclaredAnnotation(ExcelImportTempleteVaild.class);
                         if (y == 0 && i == 0 && Objects.nonNull(excelImportTempleteVaild) && excelImportTempleteVaild.value() && (lastcell != fields.length || sheets != clazz.size())) {
-                            throw ExceptionResultEnum.ERROR.exception("导入文件和模版不一致，表头应包含【" + String.join(",", headList) + "】");
+                            throw ExceptionResultEnum.ERROR.exception("导入文件和模版不一致，表头应包含[" + String.join(",", headList) + "]");
                         }
 
                         boolean extend = fields[fields.length - 1].getName().contains(SystemConstant.EXTEND_COLUMN);
@@ -196,7 +196,7 @@ public class ExcelUtil {
                                 String cellName = String.valueOf(cell);
                                 if (y == 0) {
                                     if (!headList.contains(cellName)) {
-                                        throw ExceptionResultEnum.ERROR.exception("导入文件和模版不一致，表头应包含【" + String.join(",", headList) + "】");
+                                        throw ExceptionResultEnum.ERROR.exception("导入文件和模版不一致，表头应包含[" + String.join(",", headList) + "]");
                                     }
                                 }
                                 columnNameList.add(y, cellName);

teachcloud-common/src/main/resources/mapper/BasicStudentMapper.xml

@@ -93,7 +93,7 @@
             student_code AS studentCode,
             phone_number AS phoneNumber,
             bc.id AS collegeId,
-            bc.college_name AS collegeName,
+            bc.name AS collegeName,
             bm.id AS majorId,
             bm.name AS majorName,
             clazz_id AS clazzId,
@@ -108,7 +108,7 @@
                 LEFT JOIN
             basic_major bm ON stu.major_id = bm.id AND bm.enable = TRUE
                 LEFT JOIN
-            basic_college bc ON stu.belong_org_id = bc.id
+            sys_org bc ON stu.belong_org_id = bc.id
         <where>
             and stu.enable = true
             <if test="id != null and id != ''">