From 4753a47b1b5d538940a5509b504f1eaecc5a9f66 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 04 八月 2023 10:00:34 +0800
Subject: [PATCH] 优化
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 3a6118c..86d8cab 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.List;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.annotation.Excel.ColumnType;
@@ -29,6 +30,7 @@
* 鐢ㄦ埛ID
*/
@Excel(name = "鐢ㄦ埛搴忓彿", cellType = ColumnType.STRING, prompt = "鐢ㄦ埛缂栧彿")
+ @TableId
private String userId;
/**
@@ -139,11 +141,39 @@
* 鐢ㄦ埛铻嶄簯token
*/
private String rongCloudToken;
-
+ /**
+ * app鐢ㄦ埛绫诲瀷
+ * 0-app鎸囨尌绔� 1-app鍗曞叺绔� 绌�-pc绔�
+ */
+ private String appUserType;
+ /**
+ * app鐢ㄦ埛鍦ㄧ嚎鐘舵��
+ * 0-绂荤嚎 1-鍦ㄧ嚎
+ */
+ private String appOnlineState;
+ /**
+ * 鍏宠仈鎶ヨ绫诲瀷缁�
+ */
private List<String> commands;
public SysUser() {
+ }
+
+ public String getAppOnlineState() {
+ return appOnlineState;
+ }
+
+ public void setAppOnlineState(String appOnlineState) {
+ this.appOnlineState = appOnlineState;
+ }
+
+ public String getAppUserType() {
+ return appUserType;
+ }
+
+ public void setAppUserType(String appUserType) {
+ this.appUserType = appUserType;
}
public List<String> getCommands() {
@@ -188,17 +218,6 @@
public static boolean isAdmin(String userId) {
return userId != null && userId.equals("1");
- }
-
- /**
- * 鏄惁app鎸囨尌绔�
- */
- public boolean isAppLeader() {
- return isAppLeader(this.userId);
- }
-
- public boolean isAppLeader(String userId) {
- return userId != null && this.getRoles().stream().anyMatch(sysRole -> sysRole.getRoleKey().contains("appLeader"));
}
public Long getDeptId() {
--
Gitblit v1.9.3