老师

back-ui/src/views/dz/classes/index.vue

@@ -111,7 +111,8 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="ID" align="center" prop="classId" />
       <el-table-column label="名称" align="center" prop="name" />
-      <el-table-column label="学校" align="center" prop="schoolId" />
+<!--      <el-table-column label="学校" align="center" prop="schoolId" />-->
+      <el-table-column label="学校" align="center" prop="school.name" />
       <el-table-column label="开班年份" align="center" prop="year" />
       <el-table-column label="是否线上" align="center" prop="online">
         <template #default="scope">

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

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="用户ID" prop="userId">
-        <el-input
-          v-model="queryParams.userId"
-          placeholder="请输入用户ID"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
+<!--      <el-form-item label="用户ID" prop="userId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.userId"-->
+<!--          placeholder="请输入用户ID"-->
+<!--          clearable-->
+<!--          @keyup.enter="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
       <el-form-item label="教师姓名" prop="name">
         <el-input
           v-model="queryParams.name"
@@ -17,6 +17,22 @@
           @keyup.enter="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="所在校区" prop="schoolId">
+        <el-select
+                v-model="queryParams.schoolId"
+                placeholder="请选择所在校区"
+                clearable
+                style="width: 240px"
+                @keyup.enter="handleQuery"
+        >
+          <el-option
+                  v-for="item in schoolOptions"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -67,10 +83,11 @@
 
     <el-table v-loading="loading" :data="teacherList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="老师id" align="center" prop="teacherId" />
-      <el-table-column label="用户ID" align="center" prop="userId" />
-      <el-table-column label="所在校区" align="center" prop="schoolId" />
+      <el-table-column label="ID" align="center" prop="teacherId" />
       <el-table-column label="教师姓名" align="center" prop="name" />
+      <el-table-column label="所在校区" align="center" prop="schoolName" />
+      <el-table-column label="所在机构" align="center" prop="deptName" />
+      <el-table-column label="用户ID" align="center" prop="userId" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['dz:teacher:edit']">修改</el-button>
@@ -78,7 +95,7 @@
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
       v-show="total>0"
       :total="total"
@@ -90,12 +107,22 @@
     <!-- 添加或修改老师对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
       <el-form ref="teacherRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="用户ID" prop="userId">
-          <el-input v-model="form.userId" placeholder="请输入用户ID" />
-        </el-form-item>
+<!--        <el-form-item label="用户ID" prop="userId">-->
+<!--          <el-input v-model="form.userId" placeholder="请输入用户ID" />-->
+<!--        </el-form-item>-->
         <el-form-item label="教师姓名" prop="name">
           <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%">
+            <el-option
+                    v-for="item in schoolOptions"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -109,10 +136,12 @@
 
 <script setup name="Teacher">
 import { listTeacher, getTeacher, delTeacher, addTeacher, updateTeacher } from "@/api/dz/teacher"
+import { listAllSchool } from "@/api/dz/school"
 
 const { proxy } = getCurrentInstance()
 
 const teacherList = ref([])
+const schoolOptions = ref([])
 const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
@@ -147,6 +176,13 @@ function getList() {
   })
 }
 
+/** 查询校区列表 */
+function getSchoolList() {
+  listAllSchool().then(response => {
+    schoolOptions.value = response.data || []
+  })
+}
+
 // 取消按钮
 function cancel() {
   open.value = false
@@ -240,5 +276,9 @@ function handleExport() {
   }, `teacher_${new Date().getTime()}.xlsx`)
 }
 
-getList()
+onMounted(() => {
+  getSchoolList()
+  getList()
+})
+
 </script>

ie-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -34,7 +34,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户信息
- * 
+ *
  * @author ruoyi
  */
 @RestController
@@ -141,7 +141,7 @@ public class SysUserController extends BaseController
         user.setCreateBy(getUsername());
         user.setPassword2(SecurityUtils.encryptPassword2(user.getPassword()));
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
-        return toAjax(userService.insertUser(user));
+        return AjaxResult.success(userService.insertUser(user));
     }
 
     /**

ie-system/src/main/java/com/ruoyi/dz/domain/DzClasses.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 学生班级对象 dz_classes
- * 
+ *
  * @author ruoyi
  * @date 2025-09-29
  */
@@ -22,6 +22,8 @@ public class DzClasses extends BaseEntity
     @Excel(name = "学校")
     private Long schoolId;
 
+    private DzSchool school;
+
     /** 开班年份 */
     @Excel(name = "开班年份")
     private Long year;
@@ -42,72 +44,80 @@ public class DzClasses extends BaseEntity
     @Excel(name = "统计数据")
     private String stats;
 
-    public void setClassId(Long classId) 
+    public DzSchool getSchool() {
+        return school;
+    }
+
+    public void setSchool(DzSchool school) {
+        this.school = school;
+    }
+
+    public void setClassId(Long classId)
     {
         this.classId = classId;
     }
 
-    public Long getClassId() 
+    public Long getClassId()
     {
         return classId;
     }
 
-    public void setSchoolId(Long schoolId) 
+    public void setSchoolId(Long schoolId)
     {
         this.schoolId = schoolId;
     }
 
-    public Long getSchoolId() 
+    public Long getSchoolId()
     {
         return schoolId;
     }
 
-    public void setYear(Long year) 
+    public void setYear(Long year)
     {
         this.year = year;
     }
 
-    public Long getYear() 
+    public Long getYear()
     {
         return year;
     }
 
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }
 
-    public void setOnline(Long online) 
+    public void setOnline(Long online)
     {
         this.online = online;
     }
 
-    public Long getOnline() 
+    public Long getOnline()
     {
         return online;
     }
 
-    public void setStatus(Long status) 
+    public void setStatus(Long status)
     {
         this.status = status;
     }
 
-    public Long getStatus() 
+    public Long getStatus()
     {
         return status;
     }
 
-    public void setStats(String stats) 
+    public void setStats(String stats)
     {
         this.stats = stats;
     }
 
-    public String getStats() 
+    public String getStats()
     {
         return stats;
     }

ie-system/src/main/java/com/ruoyi/dz/domain/DzTeacher.java

@@ -7,7 +7,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 老师对象 dz_teacher
- * 
+ *
  * @author ruoyi
  * @date 2025-09-12
  */
@@ -36,6 +36,24 @@ public class DzTeacher extends BaseEntity
 
 
     private String username;
+    private String deptName;
+    private String schoolName;
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getSchoolName() {
+        return schoolName;
+    }
+
+    public void setSchoolName(String schoolName) {
+        this.schoolName = schoolName;
+    }
 
     public String getUsername() {
         return username;
@@ -45,22 +63,22 @@ public class DzTeacher extends BaseEntity
         this.username = username;
     }
 
-    public void setTeacherId(Long teacherId) 
+    public void setTeacherId(Long teacherId)
     {
         this.teacherId = teacherId;
     }
 
-    public Long getTeacherId() 
+    public Long getTeacherId()
     {
         return teacherId;
     }
 
-    public void setUserId(Long userId) 
+    public void setUserId(Long userId)
     {
         this.userId = userId;
     }
 
-    public Long getUserId() 
+    public Long getUserId()
     {
         return userId;
     }
@@ -78,17 +96,17 @@ public class DzTeacher extends BaseEntity
         this.schoolId = schoolId;
     }
 
-    public Long getSchoolId() 
+    public Long getSchoolId()
     {
         return schoolId;
     }
 
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
 
-    public String getName() 
+    public String getName()
     {
         return name;
     }

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

@@ -2,6 +2,8 @@ package com.ruoyi.dz.service.impl;
 
 import java.util.List;
 
+import com.ruoyi.dz.domain.DzSchool;
+import com.ruoyi.dz.mapper.DzSchoolMapper;
 import com.ruoyi.enums.UserTypeEnum;
 import com.ruoyi.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,21 +14,23 @@ import com.ruoyi.dz.service.IDzTeacherService;
 
 /**
  * 老师Service业务层处理
- * 
+ *
  * @author ruoyi
  * @date 2025-09-12
  */
 @Service
-public class DzTeacherServiceImpl implements IDzTeacherService 
+public class DzTeacherServiceImpl implements IDzTeacherService
 {
     @Autowired
     private DzTeacherMapper dzTeacherMapper;
     @Autowired
+    private DzSchoolMapper schoolMapper;
+    @Autowired
     private ISysUserService userService;
 
     /**
      * 查询老师
-     * 
+     *
      * @param teacherId 老师主键
      * @return 老师
      */
@@ -38,7 +42,7 @@ public class DzTeacherServiceImpl implements IDzTeacherService
 
     /**
      * 查询老师列表
-     * 
+     *
      * @param dzTeacher 老师
      * @return 老师
      */
@@ -50,21 +54,28 @@ public class DzTeacherServiceImpl implements IDzTeacherService
 
     /**
      * 新增老师
-     * 
+     *
      * @param dzTeacher 老师
      * @return 结果
      */
     @Override
     public int insertDzTeacher(DzTeacher dzTeacher)
     {
+        if (null == dzTeacher.getDeptId()){
+            DzSchool school = schoolMapper.selectDzSchoolById(dzTeacher.getSchoolId());
+            dzTeacher.setDeptId(school.getDeptId());
+        }
         int id = dzTeacherMapper.insertDzTeacher(dzTeacher);
-        userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), dzTeacher.getDeptId(), dzTeacher.getUsername(), dzTeacher.getName());
+        Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), dzTeacher.getDeptId(), dzTeacher.getUsername(), dzTeacher.getName());
+        //反向更新dzTeacher中的userId
+        dzTeacher.setUserId(userId);
+        dzTeacherMapper.updateDzTeacher(dzTeacher);
         return id;
     }
 
     /**
      * 修改老师
-     * 
+     *
      * @param dzTeacher 老师
      * @return 结果
      */
@@ -76,7 +87,7 @@ public class DzTeacherServiceImpl implements IDzTeacherService
 
     /**
      * 批量删除老师
-     * 
+     *
      * @param teacherIds 需要删除的老师主键
      * @return 结果
      */
@@ -88,7 +99,7 @@ public class DzTeacherServiceImpl implements IDzTeacherService
 
     /**
      * 删除老师信息
-     * 
+     *
      * @param teacherId 老师主键
      * @return 结果
      */

ie-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -7,14 +7,14 @@ import com.ruoyi.enums.UserTypeEnum;
 
 /**
  * 用户 业务层
- * 
+ *
  * @author ruoyi
  */
 public interface ISysUserService
 {
     /**
      * 根据条件分页查询用户列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -22,7 +22,7 @@ public interface ISysUserService
 
     /**
      * 根据条件分页查询已分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -30,7 +30,7 @@ public interface ISysUserService
 
     /**
      * 根据条件分页查询未分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -38,7 +38,7 @@ public interface ISysUserService
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -53,7 +53,7 @@ public interface ISysUserService
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -61,7 +61,7 @@ public interface ISysUserService
 
     /**
      * 根据用户ID查询用户所属角色组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -69,7 +69,7 @@ public interface ISysUserService
 
     /**
      * 根据用户ID查询用户所属岗位组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -77,7 +77,7 @@ public interface ISysUserService
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -101,29 +101,29 @@ public interface ISysUserService
 
     /**
      * 校验用户是否允许操作
-     * 
+     *
      * @param user 用户信息
      */
     public void checkUserAllowed(SysUser user);
 
     /**
      * 校验用户是否有数据权限
-     * 
+     *
      * @param userId 用户id
      */
     public void checkUserDataScope(Long userId);
 
     /**
      * 新增用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
-    public int insertUser(SysUser user);
+    public Long insertUser(SysUser user);
 
     /**
      * 注册用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -131,7 +131,7 @@ public interface ISysUserService
 
     /**
      * 修改用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -139,7 +139,7 @@ public interface ISysUserService
 
     /**
      * 用户授权角色
-     * 
+     *
      * @param userId 用户ID
      * @param roleIds 角色组
      */
@@ -147,7 +147,7 @@ public interface ISysUserService
 
     /**
      * 修改用户状态
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -155,7 +155,7 @@ public interface ISysUserService
 
     /**
      * 修改用户基本信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -163,7 +163,7 @@ public interface ISysUserService
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userId 用户ID
      * @param avatar 头像地址
      * @return 结果
@@ -172,7 +172,7 @@ public interface ISysUserService
 
     /**
      * 更新用户登录信息（IP和登录时间）
-     * 
+     *
      * @param userId 用户ID
      * @param loginIp 登录IP地址
      * @param loginDate 登录时间
@@ -182,7 +182,7 @@ public interface ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -190,7 +190,7 @@ public interface ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userId 用户ID
      * @param password 密码
      * @param password2 明密码
@@ -200,7 +200,7 @@ public interface ISysUserService
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -208,7 +208,7 @@ public interface ISysUserService
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -216,7 +216,7 @@ public interface ISysUserService
 
     /**
      * 导入用户数据
-     * 
+     *
      * @param userList 用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
      * @param operName 操作用户
@@ -224,5 +224,5 @@ public interface ISysUserService
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
-    public int insertRelateUser(UserTypeEnum userType, Long userTypeId, Long deptId, String userName, String nickName);
+    public Long insertRelateUser(UserTypeEnum userType, Long userTypeId, Long deptId, String userName, String nickName);
 }

ie-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -30,7 +30,7 @@ import com.ruoyi.system.service.ISysRoleService;
 
 /**
  * 角色 业务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -50,7 +50,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 根据条件分页查询角色数据
-     * 
+     *
      * @param role 角色信息
      * @return 角色数据集合信息
      */
@@ -63,7 +63,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 根据用户ID查询角色
-     * 
+     *
      * @param userId 用户ID
      * @return 角色列表
      */
@@ -88,7 +88,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 根据用户ID查询权限
-     * 
+     *
      * @param userId 用户ID
      * @return 权限列表
      */
@@ -109,7 +109,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 查询所有角色
-     * 
+     *
      * @return 角色列表
      */
     @Override
@@ -120,7 +120,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 根据用户ID获取角色选择框列表
-     * 
+     *
      * @param userId 用户ID
      * @return 选中角色ID列表
      */
@@ -132,7 +132,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 通过角色ID查询角色
-     * 
+     *
      * @param roleId 角色ID
      * @return 角色对象信息
      */
@@ -144,7 +144,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 校验角色名称是否唯一
-     * 
+     *
      * @param role 角色信息
      * @return 结果
      */
@@ -162,7 +162,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 校验角色权限是否唯一
-     * 
+     *
      * @param role 角色信息
      * @return 结果
      */
@@ -180,7 +180,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 校验角色是否允许操作
-     * 
+     *
      * @param role 角色信息
      */
     @Override
@@ -194,7 +194,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 校验角色是否有数据权限
-     * 
+     *
      * @param roleIds 角色id
      */
     @Override
@@ -217,7 +217,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 通过角色ID查询角色使用数量
-     * 
+     *
      * @param roleId 角色ID
      * @return 结果
      */
@@ -229,7 +229,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 新增保存角色信息
-     * 
+     *
      * @param role 角色信息
      * @return 结果
      */
@@ -244,7 +244,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 修改保存角色信息
-     * 
+     *
      * @param role 角色信息
      * @return 结果
      */
@@ -261,7 +261,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 修改角色状态
-     * 
+     *
      * @param role 角色信息
      * @return 结果
      */
@@ -273,7 +273,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 修改数据权限信息
-     * 
+     *
      * @param role 角色信息
      * @return 结果
      */
@@ -291,7 +291,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 新增角色菜单信息
-     * 
+     *
      * @param role 角色对象
      */
     public int insertRoleMenu(SysRole role)
@@ -339,7 +339,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 通过角色ID删除角色
-     * 
+     *
      * @param roleId 角色ID
      * @return 结果
      */
@@ -356,7 +356,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 批量删除角色信息
-     * 
+     *
      * @param roleIds 需要删除的角色ID
      * @return 结果
      */
@@ -383,7 +383,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 取消授权用户角色
-     * 
+     *
      * @param userRole 用户和角色关联信息
      * @return 结果
      */
@@ -395,7 +395,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 批量取消授权用户角色
-     * 
+     *
      * @param roleId 角色ID
      * @param userIds 需要取消授权的用户数据ID
      * @return 结果
@@ -408,7 +408,7 @@ public class SysRoleServiceImpl implements ISysRoleService
 
     /**
      * 批量选择授权用户角色
-     * 
+     *
      * @param roleId 角色ID
      * @param userIds 需要授权的用户数据ID
      * @return 结果
@@ -431,7 +431,7 @@ public class SysRoleServiceImpl implements ISysRoleService
     @Override
     public SysRole selectRoleByUserType(UserTypeEnum userType) {
         SysRole cond = new SysRole();
-        cond.setUserType(userType.getVal());
+        cond.setRoleKey(userType.name().toLowerCase());//Teacher转换为数据库对应的teacher
         List<SysRole> roleList = roleMapper.selectRoleList(cond);
         if (CollectionUtils.isEmpty(roleList))
         {

ie-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -38,7 +38,7 @@ import com.ruoyi.system.service.ISysUserService;
 
 /**
  * 用户 业务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
@@ -75,7 +75,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 根据条件分页查询用户列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -88,7 +88,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 根据条件分页查询已分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -101,7 +101,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 根据条件分页查询未分配用户角色列表
-     * 
+     *
      * @param user 用户信息
      * @return 用户信息集合信息
      */
@@ -114,7 +114,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户名查询用户
-     * 
+     *
      * @param userName 用户名
      * @return 用户对象信息
      */
@@ -137,7 +137,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户ID查询用户
-     * 
+     *
      * @param userId 用户ID
      * @return 用户对象信息
      */
@@ -149,7 +149,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 查询用户所属角色组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -166,7 +166,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 查询用户所属岗位组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -183,7 +183,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户名称是否唯一
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -237,7 +237,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户是否允许操作
-     * 
+     *
      * @param user 用户信息
      */
     @Override
@@ -251,7 +251,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 校验用户是否有数据权限
-     * 
+     *
      * @param userId 用户id
      */
     @Override
@@ -271,26 +271,27 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
     @Override
     @Transactional
-    public int insertUser(SysUser user)
+    public Long insertUser(SysUser user)
     {
         // 新增用户信息
+//        int rows = userMapper.insertUser(user);
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
         insertUserPost(user);
         // 新增用户与角色管理
         insertUserRole(user);
-        return rows;
+        return user.getUserId();
     }
 
     /**
      * 注册用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -302,7 +303,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改保存用户信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -324,7 +325,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 用户授权角色
-     * 
+     *
      * @param userId 用户ID
      * @param roleIds 角色组
      */
@@ -338,7 +339,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户状态
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -350,7 +351,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户基本信息
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -362,7 +363,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 修改用户头像
-     * 
+     *
      * @param userId 用户ID
      * @param avatar 头像地址
      * @return 结果
@@ -375,7 +376,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 更新用户登录信息（IP和登录时间）
-     * 
+     *
      * @param userId 用户ID
      * @param loginIp 登录IP地址
      * @param loginDate 登录时间
@@ -388,7 +389,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param user 用户信息
      * @return 结果
      */
@@ -400,7 +401,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 重置用户密码
-     * 
+     *
      * @param userId 用户ID
      * @param password 密码
      * @return 结果
@@ -413,7 +414,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户角色信息
-     * 
+     *
      * @param user 用户对象
      */
     public void insertUserRole(SysUser user)
@@ -423,7 +424,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户岗位信息
-     * 
+     *
      * @param user 用户对象
      */
     public void insertUserPost(SysUser user)
@@ -446,7 +447,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 新增用户角色信息
-     * 
+     *
      * @param userId 用户ID
      * @param roleIds 角色组
      */
@@ -469,7 +470,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 通过用户ID删除用户
-     * 
+     *
      * @param userId 用户ID
      * @return 结果
      */
@@ -486,7 +487,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 批量删除用户信息
-     * 
+     *
      * @param userIds 需要删除的用户ID
      * @return 结果
      */
@@ -508,7 +509,7 @@ public class SysUserServiceImpl implements ISysUserService
 
     /**
      * 导入用户数据
-     * 
+     *
      * @param userList 用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
      * @param operName 操作用户
@@ -583,15 +584,17 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     @Override
-    public int insertRelateUser(UserTypeEnum userType, Long userTypeId, Long deptId, String userName, String nickName) {
+    public Long insertRelateUser(UserTypeEnum userType, Long userTypeId, Long deptId, String userName, String nickName) {
         SysUser user = new SysUser();
         user.setDeptId(deptId);
-        user.setUserName(userName);
+        user.setUserName(StringUtils.isEmpty(userName)?nickName:userName);
         user.setNickName(nickName);
         user.setUserType(userType.getVal());
         user.setUserTypeId(userTypeId);
-        user.setPassword2(RandomUtil.randomNumbers(6));
-        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        String pwd = StringUtils.isEmpty(user.getPassword())?configService.selectConfigByKey("sys.user.initPassword"):user.getPassword();
+//        user.setPassword2(RandomUtil.randomNumbers(6));
+        user.setPassword2(pwd);
+        user.setPassword(SecurityUtils.encryptPassword(pwd));
         user.setRoleIds(new Long[] {roleService.selectRoleByUserType(userType).getRoleId()});
         return insertUser(user);
     }

ie-system/src/main/resources/mapper/dz/DzClassesMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.dz.mapper.DzClassesMapper">
-    
+
     <resultMap type="DzClasses" id="DzClassesResult">
         <result property="classId"    column="class_id"    />
         <result property="schoolId"    column="school_id"    />
@@ -14,12 +14,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="stats"    column="stats"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
+        <association property="school"     javaType="DzSchool"         resultMap="DzSchoolResult" />
+    </resultMap>
+
+    <resultMap type="DzSchool" id="DzSchoolResult">
+        <result property="id"    column="id"    />
+        <result property="name"    column="school_name"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="location"    column="location"    />
+        <result property="pro"    column="pro"    />
+        <result property="city"    column="city"    />
+        <result property="area"    column="area"    />
     </resultMap>
 
     <sql id="selectDzClassesVo">
-        select class_id, school_id, year, name, online, status, stats, create_time, update_time from dz_classes
+        select t1.class_id, t1.school_id, t1.year, t1.name, t1.online, t1.status, t1.stats, t1.create_time, t1.update_time,
+        t2.id, t2.name school_name, t2.dept_id, t2.pro, t2.city, t2.area
+        from dz_classes t1
+        left join dz_school t2 on t1.school_id=t2.id
     </sql>
 
+    <select id="selectDzClassesList" parameterType="DzClasses" resultMap="DzClassesResult">
+        <include refid="selectDzClassesVo"/>
+        <where>
+            <if test="schoolId != null "> and t1.school_id = #{schoolId}</if>
+            <if test="year != null "> and t1.year = #{year}</if>
+            <if test="name != null  and name != ''"> and t1.name like concat('%', #{name}, '%')</if>
+            <if test="online != null "> and t1.online = #{online}</if>
+            <if test="status != null "> and t1.status = #{status}</if>
+            <if test="stats != null  and stats != ''"> and t1.stats = #{stats}</if>
+        </where>
+    </select>
 
     <select id="selectClassesForTeacher" parameterType="Long" resultMap="DzClassesResult">
         SELECT c.* FROM `dz_teacher_class` tc
@@ -27,23 +52,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHERE tc.`teacher_id` = #{teacherId} AND NOW() &lt; tc.`out_date`
     </select>
 
-
-
-    <select id="selectDzClassesList" parameterType="DzClasses" resultMap="DzClassesResult">
-        <include refid="selectDzClassesVo"/>
-        <where>  
-            <if test="schoolId != null "> and school_id = #{schoolId}</if>
-            <if test="year != null "> and year = #{year}</if>
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="online != null "> and online = #{online}</if>
-            <if test="status != null "> and status = #{status}</if>
-            <if test="stats != null  and stats != ''"> and stats = #{stats}</if>
-        </where>
-    </select>
-    
     <select id="selectDzClassesByClassId" parameterType="Long" resultMap="DzClassesResult">
         <include refid="selectDzClassesVo"/>
-        where class_id = #{classId}
+        where t1.class_id = #{classId}
     </select>
 
     <insert id="insertDzClasses" parameterType="DzClasses" useGeneratedKeys="true" keyProperty="classId">
@@ -57,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stats != null">stats,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateTime != null">update_time,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="schoolId != null">#{schoolId},</if>
             <if test="year != null">#{year},</if>
@@ -67,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="stats != null">#{stats},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateTime != null">#{updateTime},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDzClasses" parameterType="DzClasses">
@@ -90,9 +101,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDzClassesByClassIds" parameterType="String">
-        delete from dz_classes where class_id in 
+        delete from dz_classes where class_id in
         <foreach item="classId" collection="array" open="(" separator="," close=")">
             #{classId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ie-system/src/main/resources/mapper/dz/DzTeacherMapper.xml

@@ -3,29 +3,35 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.dz.mapper.DzTeacherMapper">
-    
+
     <resultMap type="DzTeacher" id="DzTeacherResult">
         <result property="teacherId"    column="teacher_id"    />
         <result property="userId"    column="user_id"    />
         <result property="deptId"    column="dept_id"    />
         <result property="schoolId"    column="school_id"    />
         <result property="name"    column="name"    />
+        <result property="deptName"    column="dept_name"    />
+        <result property="schoolName"    column="school_name"    />
     </resultMap>
 
     <sql id="selectDzTeacherVo">
-        select teacher_id, user_id, school_id, name from dz_teacher
+        select t1.teacher_id, t1.user_id, t1.school_id, t1.dept_id, t1.name,
+        t2.dept_name ,t3.name school_name
+        from dz_teacher t1
+        left join sys_dept t2 on t1.dept_id = t2.dept_id
+        left join dz_school t3 on t1.school_id = t3.id
     </sql>
 
     <select id="selectDzTeacherList" parameterType="DzTeacher" resultMap="DzTeacherResult">
         <include refid="selectDzTeacherVo"/>
-        <where>  
+        <where>
             <if test="userId != null "> and user_id = #{userId}</if>
             <if test="deptId != null "> and dept_id = #{deptId}</if>
             <if test="schoolId != null "> and school_id = #{schoolId}</if>
             <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
         </where>
     </select>
-    
+
     <select id="selectDzTeacherByTeacherId" parameterType="Long" resultMap="DzTeacherResult">
         <include refid="selectDzTeacherVo"/>
         where teacher_id = #{teacherId}
@@ -63,9 +69,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDzTeacherByTeacherIds" parameterType="String">
-        delete from dz_teacher where teacher_id in 
+        delete from dz_teacher where teacher_id in
         <foreach item="teacherId" collection="array" open="(" separator="," close=")">
             #{teacherId}
         </foreach>
     </delete>
-</mapper>
+</mapper>

ie-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -38,7 +38,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <association property="dept"     javaType="SysDept"         resultMap="deptResult" />
         <collection  property="roles"    javaType="java.util.List"  resultMap="RoleResult" />
     </resultMap>
-	
+
     <resultMap id="deptResult" type="SysDept">
         <id     property="deptId"    column="dept_id"     />
         <result property="parentId"  column="parent_id"   />
@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="leader"    column="leader"      />
         <result property="status"    column="dept_status" />
     </resultMap>
-	
+
     <resultMap id="RoleResult" type="SysRole">
         <id     property="roleId"       column="role_id"        />
         <result property="roleName"     column="role_name"      />
@@ -57,7 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="dataScope"    column="data_scope"     />
         <result property="status"       column="role_status"    />
     </resultMap>
-	
+
 	<sql id="selectUserVo">
         select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark,
 		u.location,u.exam_type,u.reg_status,u.end_year,u.invite_code,u.scores,u.select_subject,u.directed_study,u.card_id,
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    left join sys_user_role ur on u.user_id = ur.user_id
 		    left join sys_role r on r.role_id = ur.role_id
     </sql>
-    
+
     <select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
 		select u.user_id, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader, u.user_type, u.user_type_id from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
@@ -97,7 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -114,7 +114,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUnallocatedList" parameterType="SysUser" resultMap="SysUserResult">
 	    select distinct u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.phonenumber, u.status, u.create_time
 	    from sys_user u
@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-	
+
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 	    <include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'
@@ -147,19 +147,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<include refid="selectUserVo"/>
 		where u.user_id = #{userId}
 	</select>
-	
+
 	<select id="checkUserNameUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1
 	</select>
-	
+
 	<select id="checkEmailUnique" parameterType="String" resultMap="SysUserResult">
 		select user_id, email from sys_user where email = #{email} and del_flag = '0' limit 1
 	</select>
-	
+
 	<insert id="insertUser" parameterType="SysUser" useGeneratedKeys="true" keyProperty="userId">
  		insert into sys_user(
  			<if test="userId != null and userId != 0">user_id,</if>
@@ -185,7 +185,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		    <if test="cardId != null and cardId != ''">card_id,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
-		    <if test="userType != null'">user_type,</if>
+		    <if test="userType != null and userType != ''">user_type,</if>
 		    <if test="userTypeId != null">user_type_id,</if>
  			create_time
  		)values(
@@ -217,7 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			sysdate()
  		)
 	</insert>
-	
+
 	<update id="updateUser" parameterType="SysUser">
  		update sys_user
  		<set>
@@ -247,32 +247,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		</set>
  		where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserStatus" parameterType="SysUser">
  		update sys_user set status = #{status}, update_time = sysdate() where user_id = #{userId}
 	</update>
-	
+
 	<update id="updateUserAvatar" parameterType="SysUser">
  		update sys_user set avatar = #{avatar}, update_time = sysdate() where user_id = #{userId}
 	</update>
-	
+
   	<update id="updateLoginInfo" parameterType="SysUser">
  		update sys_user set login_ip = #{loginIp}, login_date = #{loginDate} where user_id = #{userId}
 	</update>
-	
+
 	<update id="resetUserPwd" parameterType="SysUser">
  		update sys_user set pwd_update_date = sysdate(), password = #{password}, password2 = #{password2}, update_time = sysdate() where user_id = #{userId}
 	</update>
-	
+
 	<delete id="deleteUserById" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id = #{userId}
  	</delete>
- 	
+
  	<delete id="deleteUserByIds" parameterType="Long">
  		update sys_user set del_flag = '2' where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}
-        </foreach> 
+        </foreach>
  	</delete>
-	
-</mapper> 
+
+</mapper>