From 798bec4812451c5ceab78c542f3d9afc6bd5ab0c Mon Sep 17 00:00:00 2001
From: jxy_duyi <2826961034@qq.com>
Date: Tue, 22 Apr 2025 15:25:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E8=BA=AB=E4=BB=BD=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysProfileController.java      | 51 +++----------------
 1 file changed, 8 insertions(+), 43 deletions(-)

diff --git a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java
index 7784c79..ba37736 100644
--- a/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java
+++ b/m2pool-modules/m2pool-system/src/main/java/com/m2pool/system/controller/SysProfileController.java
@@ -60,58 +60,23 @@ public class SysProfileController extends BaseController
         String username = SecurityUtils.getUsername();
         SysUser user = userService.selectUserByUserName(username);
 
+        if(StringUtils.isNull(user)){
+            return AjaxResult.error("服务器繁忙,资源请求失败！");
+        }
+
         //隐藏不需要返回前端的信息
         SysUserDto userDto = new SysUserDto();
-        SysRoleDto roleDto = new SysRoleDto();
-
         BeanUtils.copyProperties(user,userDto);
 
-        if (StringUtils.isNull(user.getRoles()) || user.getRoles().size() < 1)
-        {
-            //todo 动态获取注册用户信息
-            roleDto.setRoleId(2L);
-            roleDto.setRoleKey("registered");
-            roleDto.setRoleName("L2");
-            roleDto.setLevel("L2");
-        }else {
-            SysRole sysRole = user.getRoles().get(0);
-            BeanUtils.copyProperties(sysRole,roleDto);
-            if (sysRole.getRoleId() == 1L) {
-                roleDto.setLevel("admin");
-            } else if (sysRole.getRoleId() == 2L) {
-                roleDto.setLevel("L2");
-            } else if (sysRole.getRoleId() == 3L) {
-                roleDto.setLevel("L3");
+        SysRole sysRole = user.getRoles().get(0);
 
-                //此时角色是L3 说明应该在会员有效期
-                SysUserLeveDate userLevelInfo = userLevelMapper.getUserLevelInfo(SecurityUtils.getUserId());
-                if(StringUtils.isNotNull(userLevelInfo)){
-                    if(userLevelInfo.getLevelType() == 0){
-                        roleDto.setRoleName("月度"+roleDto.getRoleName());
-                    }else if(userLevelInfo.getLevelType() == 1){
-                        roleDto.setRoleName("年度"+roleDto.getRoleName());
-                    }
-                }else {
-                    //如果查询不到userLevelInfo 说明用户已过期 修改profit返回的用户等级为L2
-                    roleDto.setRoleId(2L);
-                    roleDto.setRoleKey("registered");
-                    roleDto.setRoleName("L2");
-                    roleDto.setLevel("L2");
-                }
-            } else if (sysRole.getRoleId() == 4L) {
-                roleDto.setLevel("L4");
-            }else {
-                roleDto.setLevel(roleDto.getRoleKey());
-            }
-
-        }
+        SysRoleDto roleDto = new SysRoleDto();
+        BeanUtils.copyProperties(sysRole,roleDto);
 
         userDto.setRole(roleDto);
 
-        //AjaxResult ajax = AjaxResult.success(userDto);
-
-        //ajax.put("roleGroup", userService.selectUserRoleGroup(username));
         return AjaxResult.success(userDto);
+
     }
 
     @PostMapping("userLevel")