From b0b09870e7bfd3d3cda7a38cc924e86c633938e5 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期五, 28 七月 2023 08:56:03 +0800
Subject: [PATCH] 增加app任务详情查看时间和查看位置 修复用户不按部门过滤的问题
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java | 28 ++++++++++++++++------------
1 files changed, 16 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..1f48457 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
@@ -139,11 +139,26 @@
* 鐢ㄦ埛铻嶄簯token
*/
private String rongCloudToken;
-
+ /**
+ * app鐢ㄦ埛绫诲瀷
+ * 0-app鎸囨尌绔� 1-app鍗曞叺绔� 绌�-pc绔�
+ */
+ private String appUserType;
+ /**
+ * 鍏宠仈鎶ヨ绫诲瀷缁�
+ */
private List<String> commands;
public SysUser() {
+ }
+
+ public String getAppUserType() {
+ return appUserType;
+ }
+
+ public void setAppUserType(String appUserType) {
+ this.appUserType = appUserType;
}
public List<String> getCommands() {
@@ -188,17 +203,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