From 947d016e4bd349b78d540e3a869f55d68b2c610c Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期二, 08 十一月 2022 18:16:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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..67271d7 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;
}
@@ -37,16 +37,17 @@
return ids;
}
}
- else if(StringUtils.equals("2", sysUser.getRoleIds()))
+ 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