From 1fb23cbeeaaeda0a66cf8fe8977c3f5915743cc7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 21 十月 2022 15:13:10 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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..1c70b56 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,23 +1,23 @@
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) {
-
+ public static List<String> getPermission(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
+ {
if (StringUtils.equals("3", sysUser.getRoleIds())) {
if (StringUtils.isEmpty(sysUser.getDataPermission())) {
return null;
@@ -46,7 +46,7 @@
else if(StringUtils.equals("1", sysUser.getRoleIds()))
{
//管理员
- List<String> ids=iOrganizationChartService.getIds(null);
+ List<String> ids=iOrganizationChartService.getIds("");
return ids;
}
else
--
Gitblit v1.7.1