From e098e89e2e358f73bdc3f8bf39b83371d70a1c34 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 14 五月 2025 17:13:04 +0800
Subject: [PATCH] 登录成功返回用户权限和用户信息
---
src/main/java/com/whyc/service/LoginService.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/whyc/service/LoginService.java b/src/main/java/com/whyc/service/LoginService.java
index 5be4b06..8c162e3 100644
--- a/src/main/java/com/whyc/service/LoginService.java
+++ b/src/main/java/com/whyc/service/LoginService.java
@@ -238,8 +238,8 @@
//鍥炲啓鐧诲綍鏃堕棿鍒版暟鎹簱
userService.updateLoginTime(userInf.getId());
//鏌ヨ鐢ㄦ埛瀵瑰簲鐨勬潈闄愮粍id骞惰繑鍥炵粰鍓嶇
- LinkedList<Object> dataList = new LinkedList<>();
- dataList.add(userInf);
+ Map<String,Object> map=new HashMap<>();
+ map.put("user",userInf);
PermitgroupUsr permitGroup = permitGroupUserService.getPermitGroup(userInf.getId());
if(permitGroup == null){
return response.set(1, false, "褰撳墠鐢ㄦ埛娌℃湁瀵瑰簲鐨勬潈闄愮粍,鐧诲綍澶辫触");
@@ -247,12 +247,12 @@
int permitGroupId = permitGroup.getPermitGroupId();
//鏌ヨ鏉冮檺缁勪俊鎭�
List<Permitgroup> permitgroupList=permitGroupService.getPermitGroup(permitGroupId);
- dataList.add(permitgroupList);
+ map.put("permit",permitgroupList);
}
//鏌ヨ鐢ㄦ埛瀵瑰簲鐨勭彮缁勬爣璇�
- dataList.add(bjService.getGroupFlag(userInf.getId().intValue()));
+ map.put("teamFlag",bjService.getGroupFlag(userInf.getId().intValue()));
CommonUtil.record( UserLogTypeEnum.CATEGORY_SYSTEM.getType(), UserLogTypeEnum.LOGIN.getType(),UserLogTypeEnum.LOGIN.getName(), UserLogTypeEnum.LOGIN.getName());
- return response.setII(1, true, dataList, "鐧诲綍鎴愬姛");
+ return response.setII(1, true, map, "鐧诲綍鎴愬姛");
}
return response.set(1, false,"璁よ瘉鏈�氳繃");
}
--
Gitblit v1.9.1