Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

ie-admin/src/main/java/com/ruoyi/web/controller/dz/DzTeacherController.java

@@ -86,7 +86,7 @@ public class DzTeacherController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody DzTeacher dzTeacher)
     {
-        return toAjax(dzTeacherService.insertDzTeacher(dzTeacher));
+        return AjaxResult.success(dzTeacherService.insertDzTeacher(dzTeacher));
     }
 
     /**

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

@@ -5,15 +5,15 @@ import com.ruoyi.dz.domain.DzTeacher;
 
 /**
  * 老师Service接口
- * 
+ *
  * @author ruoyi
  * @date 2025-09-12
  */
-public interface IDzTeacherService 
+public interface IDzTeacherService
 {
     /**
      * 查询老师
-     * 
+     *
      * @param teacherId 老师主键
      * @return 老师
      */
@@ -21,7 +21,7 @@ public interface IDzTeacherService
 
     /**
      * 查询老师列表
-     * 
+     *
      * @param dzTeacher 老师
      * @return 老师集合
      */
@@ -29,15 +29,15 @@ public interface IDzTeacherService
 
     /**
      * 新增老师
-     * 
+     *
      * @param dzTeacher 老师
      * @return 结果
      */
-    public int insertDzTeacher(DzTeacher dzTeacher);
+    public Long insertDzTeacher(DzTeacher dzTeacher);
 
     /**
      * 修改老师
-     * 
+     *
      * @param dzTeacher 老师
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IDzTeacherService
 
     /**
      * 批量删除老师
-     * 
+     *
      * @param teacherIds 需要删除的老师主键集合
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IDzTeacherService
 
     /**
      * 删除老师信息
-     * 
+     *
      * @param teacherId 老师主键
      * @return 结果
      */

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

@@ -74,21 +74,22 @@ public class DzTeacherServiceImpl implements IDzTeacherService
      * @return 结果
      */
     @Override
-    public int insertDzTeacher(DzTeacher dzTeacher)
+    public Long insertDzTeacher(DzTeacher dzTeacher)
     {
         if (null == dzTeacher.getDeptId()){
-            DzSchool school = schoolMapper.selectDzSchoolById(dzTeacher.getSchoolId());
+            DzSchool school = schoolMapper.selectDzSchoolById(dzTeacher.getCampusId());
             dzTeacher.setDeptId(school.getDeptId());
         }
-        int id = dzTeacherMapper.insertDzTeacher(dzTeacher);//将老师的userId填充到user的userName中
-        Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), dzTeacher.getDeptId(), String.valueOf(id), dzTeacher.getName());
+        dzTeacherMapper.insertDzTeacher(dzTeacher);//将老师的userId填充到user的userName中
+        Long teacherId = dzTeacher.getTeacherId();
+        Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), dzTeacher.getDeptId(), String.valueOf(teacherId), dzTeacher.getName());
         //反向更新dzTeacher中的userId
         dzTeacher.setUserId(userId);
         if (StringUtils.isEmpty(dzTeacher.getName())){
-            dzTeacher.setName(String.valueOf(id));
+            dzTeacher.setName(String.valueOf(teacherId));
         }
         dzTeacherMapper.updateDzTeacher(dzTeacher);
-        return id;
+        return teacherId;
     }
 
     /**

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

@@ -612,6 +612,7 @@ public class SysUserServiceImpl implements ISysUserService
         user.setPassword2(pwd);
         user.setPassword(SecurityUtils.encryptPassword(pwd));
         user.setRoleIds(new Long[] {roleService.selectRoleByUserType(userType).getRoleId()});
-        return insertUser(user);
+        insertUser(user);
+        return user.getUserId();
     }
 }