From bb2df18f6dd46eb4446e52480240e0b25c54fb6d Mon Sep 17 00:00:00 2001
From: s2042968 <s2042968@ed.ac.uk>
Date: Thu, 9 Jan 2025 13:45:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=86=99=E8=8E=B7=E5=8F=96=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E8=BA=AB=E4=BB=BD=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../software/manage/controller/UserController.java    | 11 +++++++++++
 .../software/manage/pojo/resp/UserLoginResponse.java  |  1 -
 .../manage/service/serviceimpl/UserServiceImpl.java   |  1 -
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
index e8806b7..fef0f70 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java
@@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.controller;
 import com.electromagnetic.industry.software.common.enums.PublishEnum;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
 import com.electromagnetic.industry.software.common.util.ElectromagneticResultUtil;
+import com.electromagnetic.industry.software.common.util.UserThreadLocal;
 import com.electromagnetic.industry.software.manage.pojo.req.*;
 import com.electromagnetic.industry.software.manage.service.UserService;
 import io.swagger.annotations.ApiOperation;
@@ -95,4 +96,14 @@ public class UserController {
         return ElectromagneticResultUtil.success(userService.resetPassword(userId));
     }
 
+    @ApiOperation(value = "获取当前用户管理员类型")
+    @GetMapping(value = "/getAdminType")
+    public ElectromagneticResult<?> getAdminType() {
+        String adminType = UserThreadLocal.getAdminType();
+        if (adminType == null || adminType.isEmpty()) {
+            return ElectromagneticResultUtil.fail("500","当前用户未登录");
+        } else {
+            return ElectromagneticResultUtil.success(adminType);
+        }
+    }
 }
\ No newline at end of file
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java
index aab2dc7..8c6c06d 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UserLoginResponse.java
@@ -11,5 +11,4 @@ public class UserLoginResponse implements Serializable {
 
     private String userId;
 
-    private String adminType;
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
index 8b827cf..455cf4f 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java
@@ -70,7 +70,6 @@ public class UserServiceImpl implements UserService {
             UserLoginResponse userLoginResponse = new UserLoginResponse();
             userLoginResponse.setToken(tokenStr);
             userLoginResponse.setUserId(user.getUserId());
-            userLoginResponse.setAdminType(user.getAdminType());
             return ElectromagneticResultUtil.success(userLoginResponse);
         }
         return ElectromagneticResultUtil.fail("500", "用户不存在/密码错误");