From acebf48e2e139f6f298cfbba829cc3c29db3c891 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 03 七月 2024 10:20:23 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
index 5a4516b..ddece93 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/system/controller/BaseController.java
@@ -1,16 +1,32 @@
package com.zy.asrs.wms.system.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.common.domain.enums.LoginSystemType;
import com.zy.asrs.wms.common.domain.BaseParam;
+import com.zy.asrs.wms.system.entity.Role;
import com.zy.asrs.wms.system.entity.User;
+import com.zy.asrs.wms.system.entity.UserLogin;
+import com.zy.asrs.wms.system.service.UserLoginService;
+import com.zy.asrs.wms.system.service.UserRoleService;
+import com.zy.asrs.wms.system.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
+import java.util.List;
import java.util.Map;
/**
* Created by vincent on 1/30/2024
*/
public class BaseController {
+
+ @Autowired
+ private UserLoginService userLoginService;
+ @Autowired
+ private UserRoleService userRoleService;
+ @Autowired
+ private UserService userService;
public User getLoginUser() {
try {
@@ -19,6 +35,11 @@
Object object = authentication.getPrincipal();
if (object instanceof User) {
return (User) object;
+ }
+ if(object instanceof UserLogin) {
+ UserLogin userLogin = (UserLogin) object;
+ User user = userService.superGetById(userLogin.getUserId());
+ return user;
}
}
} catch (Exception e) {
@@ -34,7 +55,7 @@
public Long getHostId() {
User loginUser = getLoginUser();
- return loginUser == null ? null : loginUser.getHostId();
+ return loginUser.getHostId();
}
public <T extends BaseParam> T buildParam(Map<String, Object> map, Class<T> clz) {
--
Gitblit v1.9.1