From 1de0a85c067ceb62413d0f458899dca41b8322d0 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 17 十一月 2022 17:07:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 40 +++++++++++++++++++++++++++++-----------
1 files changed, 29 insertions(+), 11 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 ebec6a9..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
@@ -1,24 +1,24 @@
package com.dg.core.util;
+import com.dg.core.controller.OrganizationController;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.service.impl.OrganizationChartImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+@RestController
public class PermissionUtil
{
- @Autowired(required = true)
- static IOrganizationChartService iOrganizationChartService;
-
-
- public static List<String> getPermission(SysUser sysUser) {
-
- if (StringUtils.equals("3", sysUser.getRoleIds())) {
+ public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
+ {
+ 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(null);
+// List<String> ids=iOrganizationChartService.getIds("");
+ List<String> ids=null;
return ids;
}
else
--
Gitblit v1.7.1