From dca36684d56ab66d6a7ce5172ef9e2b916b17a87 Mon Sep 17 00:00:00 2001
From: 176yunxuan <362612387@qq.com~>
Date: Wed, 24 Jan 2024 19:12:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/jsl/oa/mapper/RoleMapper.java             | 2 +-
 src/main/java/com/jsl/oa/model/voData/UserEditVO.java       | 2 ++
 src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java | 3 +++
 src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/jsl/oa/mapper/RoleMapper.java b/src/main/java/com/jsl/oa/mapper/RoleMapper.java
index e4cf57e..5dc299e 100644
--- a/src/main/java/com/jsl/oa/mapper/RoleMapper.java
+++ b/src/main/java/com/jsl/oa/mapper/RoleMapper.java
@@ -12,7 +12,7 @@ public interface RoleMapper {
     @Insert("insert into organize_oa.oa_role_user (uid, rid) VALUE (#{uid},#{rid})")
     void roleAddUser(Long uid, Long rid);
 
-    @Select("INSERT INTO organize_oa.oa_role (role_name) VALUES (#{roleName})")
+    @Select("INSERT INTO organize_oa.oa_role (role_name,display_name) VALUES (#{roleName,display_name})")
     void roleAdd(RoleDO roleDO);
 
     @Delete("delete from organize_oa.oa_role_user where uid=#{uid}")
diff --git a/src/main/java/com/jsl/oa/model/voData/UserEditVO.java b/src/main/java/com/jsl/oa/model/voData/UserEditVO.java
index 0f00012..b04b3d1 100644
--- a/src/main/java/com/jsl/oa/model/voData/UserEditVO.java
+++ b/src/main/java/com/jsl/oa/model/voData/UserEditVO.java
@@ -10,6 +10,8 @@ import javax.validation.constraints.Pattern;
 
 @Data
 public class UserEditVO {
+    @NotNull
+    private Long rid;
 
     @NotNull
     private Long id;
diff --git a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
index 94e4b3e..fb7edb2 100755
--- a/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/AuthServiceImpl.java
@@ -74,6 +74,9 @@ public class AuthServiceImpl implements AuthService {
         // 插入数据
         if (userMapper.insertUser(userDO)) {
             userDO.setPassword(null);
+            //默认角色为学生
+            UserDO userDO1 = userMapper.getUserByUserNum(userDO.getUsername());
+            roleDAO.addRoleUser(userDO1.getId(), 2L);
             return ResultUtil.success("注册成功", userDO);
         } else {
             return ResultUtil.error(ErrorCode.DATABASE_INSERT_ERROR);
diff --git a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
index a9c3c75..49af43d 100755
--- a/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/UserServiceImpl.java
@@ -249,6 +249,7 @@ public class UserServiceImpl implements UserService {
                 .setAccountNoLocked(userEditVO.getIsLocked());
         //向数据库中修改属性
         userDAO.userEdit(userDO);
+        roleDAO.roleChangeUser(userEditVO.getId(),userEditVO.getRid());
 
         return ResultUtil.success("用户信息修改成功");
     }