From 61046f00aa8d504372a0fd6f26334846c4ba33dc Mon Sep 17 00:00:00 2001 From: 张天森 <1292933220@qq.com> Date: 星期五, 25 十一月 2022 15:52:21 +0800 Subject: [PATCH] Merge branch 'huacheng_test' into haucheng_panzhihua --- flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java index 70ad5b8..44cdb75 100644 --- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java +++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java @@ -244,4 +244,37 @@ } return ids; } + + + /** + * 查询机构列表 + */ + @ApiOperation(value = "查询可切换机构列表",response = OrganizationChartEntity.class) + @GetMapping("switch/getList") + @Authorization + public TableDataInfo switchGetList(@CurrentUser SysUser sysUser) + { + List<String> ids=new ArrayList<>(); + if(!StringUtils.isEmpty(sysUser.getMoreDepartmentIds())) + { + if(sysUser.getMoreDepartmentIds().indexOf(",")==-1) + { + ids.add(sysUser.getDepartmentId()); + } + else + { + String[] list=sysUser.getMoreDepartmentIds().split(","); + for (String id:list) + { + ids.add(id); + } + } + } + else + { + ids.add(sysUser.getDepartmentId()); + } + + return getDataTable(iOrganizationChartService.selectConfigList(ids)); + } } -- Gitblit v1.7.1