From 52123c927f77f41f71461ef0d422525656bd7b6f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 07 五月 2026 11:53:26 +0800
Subject: [PATCH] 优化营销客户相关
---
src/main/java/com/ruoyi/framework/security/LoginUser.java | 116 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 75 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/ruoyi/framework/security/LoginUser.java b/src/main/java/com/ruoyi/framework/security/LoginUser.java
index bb91be1..330ae43 100644
--- a/src/main/java/com/ruoyi/framework/security/LoginUser.java
+++ b/src/main/java/com/ruoyi/framework/security/LoginUser.java
@@ -76,47 +76,58 @@
*/
private Long tenantId;
- /**
- * 褰撳墠閮ㄩ棬id
- */
- private Long currentDeptId;
+ /**
+ * 褰撳墠閮ㄩ棬id
+ */
+ private Long currentDeptId;
+
+ /**
+ * 鏄惁寮�閫欰I鍔熻兘锛�0鍚� 1鏄級
+ */
+ private Integer aiEnabled;
+
+ private String dataScope;
public LoginUser()
{
}
- public LoginUser(SysUser user, Set<String> permissions)
- {
- this.user = user;
- this.permissions = permissions;
- }
+ public LoginUser(SysUser user, Set<String> permissions)
+ {
+ this.user = user;
+ this.permissions = permissions;
+ this.aiEnabled = user == null ? null : user.getAiEnabled();
+ }
- public LoginUser(Long userId, Long [] deptId, SysUser user, Set<String> permissions)
- {
- this.userId = userId;
- this.deptIds = deptId;
- this.user = user;
- this.permissions = permissions;
- }
+ public LoginUser(Long userId, Long [] deptId, SysUser user, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptIds = deptId;
+ this.user = user;
+ this.permissions = permissions;
+ this.aiEnabled = user == null ? null : user.getAiEnabled();
+ }
- public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId, Set<String> permissions)
- {
- this.userId = userId;
- this.deptIds = deptIds;
- this.user = user;
- this.permissions = permissions;
- this.tenantId = tenantId;
- }
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptIds = deptIds;
+ this.user = user;
+ this.permissions = permissions;
+ this.tenantId = tenantId;
+ this.aiEnabled = user == null ? null : user.getAiEnabled();
+ }
- public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId,Long currentDeptId, Set<String> permissions)
- {
- this.userId = userId;
- this.deptIds = deptIds;
- this.user = user;
- this.permissions = permissions;
- this.tenantId = tenantId;
- this.currentDeptId = currentDeptId;
- }
+ public LoginUser(Long userId, Long [] deptIds, SysUser user,Long tenantId,Long currentDeptId, Set<String> permissions)
+ {
+ this.userId = userId;
+ this.deptIds = deptIds;
+ this.user = user;
+ this.permissions = permissions;
+ this.tenantId = tenantId;
+ this.currentDeptId = currentDeptId;
+ this.aiEnabled = user == null ? null : user.getAiEnabled();
+ }
public Long getUserId()
{
@@ -287,10 +298,11 @@
return user;
}
- public void setUser(SysUser user)
- {
- this.user = user;
- }
+ public void setUser(SysUser user)
+ {
+ this.user = user;
+ this.aiEnabled = user == null ? null : user.getAiEnabled();
+ }
@Override
public Collection<? extends GrantedAuthority> getAuthorities()
@@ -314,7 +326,29 @@
return currentDeptId;
}
- public void setCurrentDeptId(Long currentDeptId) {
- this.currentDeptId = currentDeptId;
- }
-}
+ public void setCurrentDeptId(Long currentDeptId) {
+ this.currentDeptId = currentDeptId;
+ }
+
+ public Integer getAiEnabled() {
+ if (aiEnabled != null) {
+ return aiEnabled;
+ }
+ if (user != null && user.getAiEnabled() != null) {
+ return user.getAiEnabled();
+ }
+ return 0;
+ }
+
+ public void setAiEnabled(Integer aiEnabled) {
+ this.aiEnabled = aiEnabled;
+ }
+
+ public String getDataScope() {
+ return dataScope;
+ }
+
+ public void setDataScope(String dataScope) {
+ this.dataScope = dataScope;
+ }
+}
--
Gitblit v1.9.3