From 194b05325b3c86b414f953710228d658355708e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Wed, 20 Dec 2023 22:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/service/user/UserService.java   | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
index c13f6ede..e21693ad 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -349,19 +349,13 @@ public class UserService {
         }
         data.put("msgTip", msgTip);
         if(user!=null){
-            String roleType = getRoleTypeByUserId(user.getId()).getType(); //角色类型
+            user.setPassword(null);
             redisService.storageObjectBySession(token,"clientIp", Tools.getLocalIp(request));
             logService.insertLogWithUserId(user.getId(), user.getTenantId(), "用户",
                     new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_LOGIN).append(user.getLoginName()).toString(),
                     ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest());
-            JSONArray btnStrArr = getBtnStrArrById(user.getId());
             data.put("token", token);
             data.put("user", user);
-            //用户的按钮权限
-            if(!"admin".equals(user.getLoginName())){
-                data.put("userBtn", btnStrArr);
-            }
-            data.put("roleType", roleType);
         }
         return data;
     }