From a4ad3d33874fe32096a3d918a4a3edd7e34081cd Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Sat, 8 Jun 2024 09:56:08 +0800
Subject: [PATCH] =?UTF-8?q?fix(sj=5F1.0.0):=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E5=8F=AA=E9=99=90=E5=88=B6=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/SystemUserController.java    | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java
index 29e2d89f..cd1a20e5 100644
--- a/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java
+++ b/snail-job-server/snail-job-server-web/src/main/java/com/aizuda/snailjob/server/web/controller/SystemUserController.java
@@ -1,6 +1,5 @@
 package com.aizuda.snailjob.server.web.controller;
 
-import cn.hutool.core.lang.Assert;
 import com.aizuda.snailjob.server.common.exception.SnailJobServerException;
 import com.aizuda.snailjob.server.web.annotation.LoginRequired;
 import com.aizuda.snailjob.server.web.annotation.LoginUser;
@@ -12,9 +11,8 @@ import com.aizuda.snailjob.server.web.model.request.UserSessionVO;
 import com.aizuda.snailjob.server.web.model.response.PermissionsResponseVO;
 import com.aizuda.snailjob.server.web.model.response.SystemUserResponseVO;
 import com.aizuda.snailjob.server.web.service.SystemUserService;
-import com.aizuda.snailjob.server.web.util.UserSessionUtils;
 import jakarta.validation.Valid;
-import org.springframework.beans.factory.annotation.Autowired;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -26,12 +24,11 @@ import java.util.List;
  * @since 2022-03-05
  */
 @RestController
+@RequiredArgsConstructor
 public class SystemUserController {
 
     private static final Long SUPER_ADMIN_ID = 1L;
-
-    @Autowired
-    private SystemUserService systemUserService;
+    private final SystemUserService systemUserService;
 
     @PostMapping("/auth/login")
     public SystemUserResponseVO login(@RequestBody SystemUserRequestVO requestVO) {
@@ -56,14 +53,10 @@ public class SystemUserController {
         return systemUserService.getSystemUserPageList(systemUserQueryVO);
     }
 
+    @LoginRequired(role = RoleEnum.ADMIN)
     @PutMapping("/user")
     public void update(@RequestBody @Valid SystemUserRequestVO requestVO) {
-        // 1. 普通用户不允许修改其他用户
-        if (!SUPER_ADMIN_ID.equals(requestVO.getId())) {
-            Assert.equals(UserSessionUtils.currentUserSession().getId(), requestVO.getId(),
-                    "普通用户不允许修改其他用户");
-        }
-        // 2. 超级管理员(id=1)不能变更为普通用户
+        // 1. 超级管理员(id=1)不能变更为普通用户
         if (SUPER_ADMIN_ID.equals(requestVO.getId()) && RoleEnum.isUser(requestVO.getRole())) {
             throw new SnailJobServerException("不允许修改超级管理员角色");
         }