From 94e3a209bb9a31c4ddbd31494bb1628f6fe2e96e Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期三, 12 十月 2022 17:54:49 +0800
Subject: [PATCH] 新增首页工单 办事指南排行榜接口 导办人员排行榜接口 组织排行榜接口 新增办事指南统计接口 导办人员统计接口 组织胖行榜统计接口
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 bc0f74d..38e281d 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
@@ -88,8 +88,9 @@
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
Assert.notNull(Id, "Id 不能为空");
- OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
- if(!StringUtils.isEmpty(entity.getParentId()))
+ List<OrganizationChartEntity> list=iOrganizationChartService.selectParentList(Id,"");
+
+ if(list!=null && list.size()>0)
{
return ResultData.error("该机构下存在其他部门！请先删除子部门");
}
@@ -138,26 +139,25 @@
*/
@ApiOperation(value = "通过父级id查询对应机构下的全部部门",response = OrganizationChartEntity.class)
@GetMapping("/getdepartment")
- public TableDataInfo getIds(@RequestParam(value = "department",required = false) String departmentId)
+ public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
{
List<OrganizationChartEntity> ids=new ArrayList<>();
- List<OrganizationChartEntity> lists = iOrganizationChartService.selectConfigList(departmentId,"");
+ List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
if(lists.size()<1)
{
lists.add(iOrganizationChartService.selectConfigById(departmentId));
}
- ids=disposestreetId(lists);
+ ids=disposestreet(lists);
if(ids.size()<1)
{
return null;
}
-// ids.add(streetId);
ids.add(iOrganizationChartService.selectConfigById(departmentId));
return getDataTable(ids);
}
//递归取id
- private List<OrganizationChartEntity> disposestreetId(List<OrganizationChartEntity> lists)
+ private List<OrganizationChartEntity> disposestreet(List<OrganizationChartEntity> lists)
{
List<OrganizationChartEntity> ids=new ArrayList<>();
for (OrganizationChartEntity sysStreet:lists)
@@ -165,7 +165,7 @@
ids.add(sysStreet);
if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
{
- ids.addAll(disposestreetId(sysStreet.getChild()));
+ ids.addAll(disposestreet(sysStreet.getChild()));
}
else
{
--
Gitblit v1.7.1