From e60d40e122f3d35104354c316d36be16b723d07d Mon Sep 17 00:00:00 2001
From: liusuyi <13324259@qq.com>
Date: 星期四, 27 七月 2023 20:01:52 +0800
Subject: [PATCH] 修改app位置推送数据按部门过滤

---
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 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 b711841..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,21 +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) {
-        List<SysRole> roles = this.getRoles();
-        if(roles==null)
-        {return false;}
-        boolean appLeader = roles.stream().anyMatch(sysRole -> sysRole.getRoleKey().contains("appLeader"));
-        return userId != null && appLeader;
     }
 
     public Long getDeptId() {

--
Gitblit v1.9.3