From b892b3d8c2a536b6c2f5f9b9e67e195779037665 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 15 十一月 2022 14:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 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 0748d90..c55fa12 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
@@ -42,7 +42,19 @@
@GetMapping("/getList")
public TableDataInfo selectConfigList()
{
- return getDataTable(iOrganizationChartService.selectConfigList("",""));
+ return getDataTable(iOrganizationChartService.selectConfigList("","",null));
+ }
+
+
+ /**
+ * 查询机构列表(权限)
+ */
+ @ApiOperation(value = "查询机构列表(权限 选择用 ) ",response = OrganizationChartEntity.class)
+ @GetMapping("/selectJurisdiction")
+ @Authorization
+ public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
+ {
+ return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
}
/**
@@ -160,7 +172,17 @@
public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
{
List<OrganizationChartEntity> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
+ List<OrganizationChartEntity> lists=null;
+ if(StringUtils.isEmpty(departmentId))
+ {
+ lists= iOrganizationChartService.selectParentList(null,"1");
+
+ }
+ else
+ {
+ lists= iOrganizationChartService.selectParentList(departmentId,null);
+ }
+
if(lists.size()<1)
{
lists.add(iOrganizationChartService.selectConfigById(departmentId));
@@ -170,7 +192,12 @@
{
return null;
}
- ids.add(iOrganizationChartService.selectConfigById(departmentId));
+
+ if(!StringUtils.isEmpty(departmentId))
+ {
+ ids.add(iOrganizationChartService.selectConfigById(departmentId));
+ }
+
return getDataTable(ids);
}
--
Gitblit v1.7.1