From 852403e90bf68ff54f48f065ba3091a47fe1d419 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期四, 10 十一月 2022 17:32:56 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
index 67271d7..cb02e1d 100644
--- a/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
+++ b/flower_city/src/main/java/com/dg/core/util/PermissionUtil.java
@@ -36,8 +36,25 @@
}
return ids;
}
- }
- else if(StringUtils.equals("2", sysUser.getUserType()))
+ } else if (StringUtils.equals("4", sysUser.getUserType())) {
+ if (StringUtils.isEmpty(sysUser.getDataPermission())) {
+ return null;
+ }
+ else
+ {
+ List<String> ids = new ArrayList<>();
+ if (sysUser.getDataPermission().indexOf(",")>0)
+ {
+ String[] idl=sysUser.getDataPermission().split(",");
+ Collections.addAll(ids,idl);
+ }
+ else
+ {
+ ids.add(sysUser.getDataPermission());
+ }
+ return ids;
+ }
+ } else if(StringUtils.equals("2", sysUser.getUserType()))
{
//导办人员
List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
--
Gitblit v1.7.1