From 0f3db47c9a6c03611ac75118017f83d18ae062f2 Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期五, 25 十一月 2022 10:33:15 +0800 Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua --- flower_city/src/main/java/com/dg/core/util/PermissionUtil.java | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 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 cb02e1d..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; @@ -73,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