From f57064d2fa563ee4cfeeccd715850ba8b8aa4f60 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 18 五月 2026 09:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index d998f45..e5c5bfa 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -15,6 +15,8 @@
import com.ruoyi.project.system.mapper.SysDeptMapper;
import com.ruoyi.project.system.service.ISysMenuService;
import com.ruoyi.project.system.service.ISysUserDeptService;
+import com.ruoyi.project.system.service.ISysUserService;
+import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.GetMapping;
@@ -34,24 +36,15 @@
* @author ruoyi
*/
@RestController
+@AllArgsConstructor
public class SysLoginController
{
- @Autowired
private SysLoginService loginService;
-
- @Autowired
private ISysMenuService menuService;
-
- @Autowired
private SysPermissionService permissionService;
-
- @Autowired
private TokenService tokenService;
-
- @Autowired
private ISysUserDeptService userDeptService;
-
- @Autowired
+ private ISysUserService userService;
private SysDeptMapper sysDeptMapper;
/**
@@ -101,6 +94,7 @@
}
AjaxResult ajax = AjaxResult.success();
ajax.put("user", user);
+ ajax.put("aiEnabled", loginUser.getAiEnabled());
ajax.put("roles", roles);
ajax.put("permissions", permissions);
return ajax;
--
Gitblit v1.9.3