Kaynağa Gözat

zhurui fix 登陆身份刷新

Leonezhurui 4 yıl önce
ebeveyn
işleme
97d81b562c

+ 18 - 0
seecoder-bok-common/src/main/java/cn/seecoder/bok/common/vo/user/UpdateUserVO.java

@@ -1,5 +1,6 @@
 package cn.seecoder.bok.common.vo.user;
 
+import cn.seecoder.bok.common.UserRole;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.ToString;
@@ -14,6 +15,8 @@ public class UpdateUserVO {
 
     private String email;
 
+    private UserRole userRole;
+
     public Integer getId() {
         return id;
     }
@@ -38,9 +41,24 @@ public class UpdateUserVO {
         this.email = email;
     }
 
+    public UserRole getUserRole() {
+        return userRole;
+    }
+
+    public void setUserRole(UserRole userRole) {
+        this.userRole = userRole;
+    }
+
     public UpdateUserVO() {
     }
 
+    public UpdateUserVO(Integer id, String name, String email, UserRole userRole) {
+        this.id = id;
+        this.name = name;
+        this.email = email;
+        this.userRole = userRole;
+    }
+
     public UpdateUserVO(Integer id, String name, String email) {
         this.id = id;
         this.name = name;

+ 1 - 1
seecoder-bok-server/src/main/java/cn/seecoder/seecoderbokserver/aspect/auth/AuthAspect.java

@@ -61,7 +61,7 @@ public class AuthAspect {
 //        System.out.println(user);
         // 创建或者更新用户
         if (userService.existsById(user.getId())) {
-            userService.updateUser(new UpdateUserVO(user.getId(), user.getName(), user.getEmail()));
+            userService.updateUser(new UpdateUserVO(user.getId(), user.getName(), user.getEmail(), user.getRole()));
         } else {
             //TODO 这里没有对HR和TEACHER作区分
             userService.createUser(UserConvertor.convertToVO(user));

+ 2 - 0
seecoder-bok-server/src/main/java/cn/seecoder/seecoderbokserver/service/UserService.java

@@ -55,6 +55,8 @@ public class UserService {
         if (user != null) {
             user.setEmail(updateUserVO.getEmail());
             user.setName(updateUserVO.getName());
+            user.setRole(updateUserVO.getUserRole());
+            userRepository.save(user);
             return UserConvertor.convertToVO(user);
         } else {
             throw new MyServiceException("A0201", "用户账号不存在");