jinxia.mo 1 месяц назад
Родитель
Сommit
955a4c98b4

+ 4 - 4
back-ui/src/views/dz/teacher/index.vue

@@ -148,7 +148,7 @@
           <el-input v-model="form.name" placeholder="请输入教师姓名" />
         </el-form-item>
         <el-form-item label="所在学校" prop="schoolId">
-          <el-select v-model="form.schoolId" placeholder="请选择所在学校" style="width: 100%" @change="handleSchoolChange">
+          <el-select v-model="form.schoolId" placeholder="请选择所在学校" style="width: 100%" filterable clearable @change="handleSchoolChange">
             <el-option
                     v-for="item in schoolOptions"
                     :key="item.id"
@@ -158,7 +158,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="学校班级" prop="schoolClassIds">
-          <el-select v-model="form.schoolClassIds" multiple placeholder="请选择学校班级" style="width: 100%" :disabled="!form.schoolId">
+          <el-select v-model="form.schoolClassIds" multiple placeholder="请选择学校班级" style="width: 100%" filterable clearable :disabled="!form.schoolId">
             <el-option
                     v-for="item in schoolClassOptions"
                     :key="item.classId"
@@ -168,7 +168,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="培训校区" prop="campusId">
-          <el-select v-model="form.campusId" placeholder="请选择培训校区" style="width: 100%" @change="handleCampusChange">
+          <el-select v-model="form.campusId" placeholder="请选择培训校区" style="width: 100%" filterable clearable @change="handleCampusChange">
             <el-option
                     v-for="item in campusOptions"
                     :key="item.id"
@@ -179,7 +179,7 @@
         </el-form-item>
         
         <el-form-item label="校区班级" prop="campusClassIds">
-          <el-select v-model="form.campusClassIds" multiple placeholder="请选择校区班级" style="width: 100%" :disabled="!form.campusId">
+          <el-select v-model="form.campusClassIds" multiple placeholder="请选择校区班级" style="width: 100%" filterable clearable :disabled="!form.campusId">
             <el-option
                     v-for="item in campusClassOptions"
                     :key="item.classId"

+ 5 - 0
ie-system/src/main/java/com/ruoyi/dz/service/impl/DzTeacherServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.dz.domain.DzSchool;
 import com.ruoyi.dz.mapper.DzSchoolMapper;
@@ -85,6 +86,10 @@ public class DzTeacherServiceImpl implements IDzTeacherService
                 dzTeacher.setDeptId(school.getDeptId());
             }
         }
+        if (null==dzTeacher.getDeptId()){
+            //如果deptId为空,需要从当前用户的机构中获取(非超级管理员)
+            dzTeacher.setDeptId(SecurityUtils.getDeptId());
+        }
         dzTeacherMapper.insertDzTeacher(dzTeacher);//将老师的userId填充到user的userName中
         Long teacherId = dzTeacher.getTeacherId();
         Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), null, dzTeacher.getDeptId(), String.valueOf(teacherId), dzTeacher.getName());