From 35838dd80eff7d45b6cb67e3b1ff22d432305f0e Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 14 五月 2025 17:09:00 +0800
Subject: [PATCH] 登录成功返回用户权限和用户信息
---
src/main/java/com/whyc/service/LoginService.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/whyc/service/LoginService.java b/src/main/java/com/whyc/service/LoginService.java
index 3c1716c..5be4b06 100644
--- a/src/main/java/com/whyc/service/LoginService.java
+++ b/src/main/java/com/whyc/service/LoginService.java
@@ -10,6 +10,7 @@
import com.whyc.mapper.PageParamMapper;
import com.whyc.mapper.UserMapper;
import com.whyc.pojo.db_app_sys.PageParam;
+import com.whyc.pojo.db_user.Permitgroup;
import com.whyc.pojo.db_user.PermitgroupUsr;
import com.whyc.pojo.db_user.User;
import com.whyc.util.*;
@@ -24,7 +25,6 @@
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import java.io.UnsupportedEncodingException;
import java.util.*;
@Service
@@ -41,6 +41,9 @@
@Resource
private PermitGroupUserService permitGroupUserService;
+
+ @Resource
+ private PermitGroupService permitGroupService;
@Autowired
private BaojigroupService bjService;
@@ -77,7 +80,7 @@
Enumeration<String> attributeNames = servletContext.getAttributeNames();
QueryWrapper<User> queryWrapper = Wrappers.query();
- queryWrapper.select("id", "status", "visit_ip", "visit_time", "password_update_time", "last_login_time").eq("name", userName);
+ queryWrapper.select("id","role","status", "visit_ip", "visit_time", "password_update_time", "last_login_time").eq("name", userName);
User userInf = userMapper.selectOne(queryWrapper);
//姣忎釜鐧诲綍鐨勭敤鎴烽兘鏈変竴涓叏灞�鍙橀噺,閲岄潰瀛樼潃瀵瑰簲鐨凷essionId;
//鍚屼竴涓处鍙�,鍚庨潰鐧诲綍鐨�,浼氭尋鎺変箣鍓嶇櫥褰曠殑SessionId,杩欎釜todo,鍋氶檺鍒惰处鍙峰悓鏃剁櫥闄嗕汉鏁颁负1
@@ -236,13 +239,15 @@
userService.updateLoginTime(userInf.getId());
//鏌ヨ鐢ㄦ埛瀵瑰簲鐨勬潈闄愮粍id骞惰繑鍥炵粰鍓嶇
LinkedList<Object> dataList = new LinkedList<>();
- dataList.add(subject.getPrincipal());
+ dataList.add(userInf);
PermitgroupUsr permitGroup = permitGroupUserService.getPermitGroup(userInf.getId());
if(permitGroup == null){
return response.set(1, false, "褰撳墠鐢ㄦ埛娌℃湁瀵瑰簲鐨勬潈闄愮粍,鐧诲綍澶辫触");
}else {
int permitGroupId = permitGroup.getPermitGroupId();
- dataList.add(permitGroupId);
+ //鏌ヨ鏉冮檺缁勪俊鎭�
+ List<Permitgroup> permitgroupList=permitGroupService.getPermitGroup(permitGroupId);
+ dataList.add(permitgroupList);
}
//鏌ヨ鐢ㄦ埛瀵瑰簲鐨勭彮缁勬爣璇�
dataList.add(bjService.getGroupFlag(userInf.getId().intValue()));
--
Gitblit v1.9.1