From 11899dc62d10c1c7778fbebb631f5ee25705b7db Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 17 十一月 2022 21:36:08 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua
---
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 8c489ee..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());
@@ -46,7 +63,8 @@
else if(StringUtils.equals("1", sysUser.getUserType()))
{
//管理员
- List<String> ids=iOrganizationChartService.getIds("");
+// List<String> ids=iOrganizationChartService.getIds("");
+ List<String> ids=null;
return ids;
}
else
--
Gitblit v1.7.1