From 01b70437d4ef3348e69b2af0dcbd7250e1234117 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期五, 25 十一月 2022 13:54:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 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 c55fa12..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
@@ -162,8 +162,34 @@
}
+
+
/**
* 通过父级id查询对应机构下的全部部门id
+ * @param departmentId
+ * @return
+ */
+ @ApiOperation(value = "通过父级id查询对应机构下的全部部门")
+ @GetMapping("/getdepartment/id")
+ public TableDataInfo getOrganizationIds(@RequestParam(value = "department",required = false) String departmentId)
+ {
+ if(StringUtils.isEmpty(departmentId))
+ {
+ return getDataTable("departmentId 不能为空");
+ }
+
+ List<String> ids=new ArrayList<>();
+ List<String> getId=iOrganizationChartService.getIds(departmentId);
+ ids.addAll(getId);
+ return getDataTable(ids);
+ }
+
+
+
+
+
+ /**
+ * 通过父级id查询对应机构下的全部部门
* @param departmentId
* @return
*/
@@ -218,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