From a02b448c103d747f814c133d030df3c8958371fd Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 15 五月 2026 17:23:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 3 +++
1 files changed, 3 insertions(+), 0 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 ad9a8b3..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,7 @@
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;
@@ -43,6 +44,7 @@
private SysPermissionService permissionService;
private TokenService tokenService;
private ISysUserDeptService userDeptService;
+ private ISysUserService userService;
private SysDeptMapper sysDeptMapper;
/**
@@ -92,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