From bef4f6d51bff03c0512a75f43e79699b7296f1fa Mon Sep 17 00:00:00 2001
From: EricsHu <hrr145632>
Date: 星期四, 23 十一月 2023 18:00:53 +0800
Subject: [PATCH] 修改系统角色逻辑、和老师身份逻辑
---
src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java b/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
index 3a00d5e..84024fa 100644
--- a/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
+++ b/src/main/java/com/qxueyou/scc/admin/teacher/service/impl/TeacherService.java
@@ -37,16 +37,19 @@
TeacherDAO dao;
/**
- * 教师管理新增
+// * 鏁欏笀绠＄悊鏂板
+ *鍚庡彴鐢ㄦ埛鍒濆鍖�
*/
@Override
public Result add(String teacherName, String password, String mobilePhone, String teacherNo) {
if (dao.exists(teacherNo) || userService.exists(teacherNo)) {
- return new Result(false, "老师编号已存在或被其他用户占用");
+// return new Result(false, "鑰佸笀缂栧彿宸插瓨鍦ㄦ垨琚叾浠栫敤鎴峰崰鐢�");
+ return new Result(false, "鐢ㄦ埛缂栧彿宸插瓨鍦ㄦ垨琚叾浠栫敤鎴峰崰鐢�");
}
User user = userService.insertUser(teacherName, teacherNo, mobilePhone, password, Boolean.FALSE, ClientUtils.getOrgId());
+// userService.insertUser(teacherName, teacherNo, mobilePhone, password, Boolean.FALSE, ClientUtils.getOrgId());
userService.addRole(user.getUserId(), UserRole.ROLE_TEACHER_ID);
@@ -64,13 +67,13 @@
}
/**
- * 更新
+ * 鏇存柊
*/
@Override
public Result update(String teacherId, String teacherName, String account, String password, String mobilePhone,
String teacherNo) {
if (StringUtils.isNotEmpty(mobilePhone) && dao.exists(mobilePhone, teacherId)) {
- return new Result(false, "手机号已存在");
+ return new Result(false, "鎵嬫満鍙峰凡瀛樺湪");
}
UserTeacher teacher = read(UserTeacher.class, teacherId);
@@ -82,10 +85,12 @@
save(teacher);
User user = read(User.class, teacher.getUserId());
+ user.setMobilePhone(mobilePhone);
+ user.setName(teacherName);
user.setAccount(teacherNo);
TraceUtils.setCreateTrace(user);
save(user);
-
+
if(StringUtils.isNotEmpty(password)){
userService.updatePassword(teacher.getUserId(), password);
}
@@ -94,7 +99,7 @@
}
/**
- * 教师管理显示列表
+ * 鏁欏笀绠＄悊鏄剧ず鍒楄〃
*/
@Override
public List<UserTeacher> lstTeacher(String keyword, Integer pageSize, Integer pageNum) {
@@ -108,7 +113,7 @@
}
/**
- * 获取教师总条数
+ * 鑾峰彇鏁欏笀鎬绘潯鏁�
*/
@Override
public int findTeacherCount(String keyword) {
@@ -139,7 +144,7 @@
}
/**
- * 教师管理 删除教师
+ * 鏁欏笀绠＄悊 鍒犻櫎鏁欏笀
*/
@Override
public Result deleteTeacher(String[] teacherIds) {
@@ -205,7 +210,7 @@
User u = this.read(User.class, ClientUtils.getUserId());
String teacherId = this.getTeacherIdByUserId(u.getUserId());
if(StringUtils.isEmpty(teacherId)) {
- return new Result(false, "当前用户无教师角色信息");
+ return new Result(false, "褰撳墠鐢ㄦ埛鏃犳暀甯堣鑹蹭俊鎭�");
}
long subjectCount = this.getQueryFactory().selectDistinct(subject.subjectId).from(subject)
--
Gitblit v1.8.0