From 220168e5abb8e8d1515653aaccd622197c321886 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期日, 09 十月 2022 13:46:49 +0800
Subject: [PATCH] 修改组织机构删除
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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 7efd705..c8229b2 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
@@ -84,15 +84,13 @@
*/
@ApiOperation("删除机构")
@DeleteMapping("/delete")
- @Authorization
+// @Authorization
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
Assert.notNull(Id, "Id 不能为空");
- OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
+ List<OrganizationChartEntity> list=iOrganizationChartService.selectParentList(Id,"");
- List<OrganizationChartEntity> list=iOrganizationChartService.selectConfigList(entity.getId()+"","");
-
- if(list.size()>0)
+ if(list!=null && list.size()>0)
{
return ResultData.error("该机构下存在其他部门！请先删除子部门");
}
@@ -144,7 +142,7 @@
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));
--
Gitblit v1.7.1