From 6f43bb7c91ed559691f78d178ee94fceb68f4cb1 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 15 十一月 2022 15:12:05 +0800
Subject: [PATCH] Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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 1c70b56..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
@@ -18,7 +18,7 @@
public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
{
- if (StringUtils.equals("3", sysUser.getRoleIds())) {
+ if (StringUtils.equals("3", sysUser.getUserType())) {
if (StringUtils.isEmpty(sysUser.getDataPermission())) {
return null;
}
@@ -36,17 +36,35 @@
}
return ids;
}
- }
- else if(StringUtils.equals("2", sysUser.getRoleIds()))
+ } 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());
return ids;
}
- else if(StringUtils.equals("1", sysUser.getRoleIds()))
+ 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