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 |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 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 53a09ab..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);
 
@@ -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);
         }

--
Gitblit v1.8.0