From d498f693733a107e5f6e8fa2e8df7591b4924af1 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期一, 28 十一月 2022 10:46: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 | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 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 67271d7..079f37f 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,11 +1,8 @@
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;
@@ -36,8 +33,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());
@@ -56,4 +70,32 @@
}
}
+
+ /**
+ * 通过部门id 获取一级部门下的全部子部门以及一级部门
+ * @param sysUser
+ * @param iOrganizationChartService
+ * @return
+ */
+ public static List<String> getStairDepartment(SysUser sysUser,IOrganizationChartService iOrganizationChartService)
+ {
+ if(StringUtils.equals("1", sysUser.getUserType()))
+ {
+ //管理员
+ List<String> ids=null;
+ return ids;
+ }
+ else
+ {
+ //获取一级部门id
+ String stairId= iOrganizationChartService.getStairId(sysUser.getDepartmentId());
+ List<String> ids=iOrganizationChartService.getIds(stairId);
+ return ids;
+ }
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1