From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 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 f1c9a5d..bc0f74d 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
@@ -1,11 +1,9 @@
package com.dg.core.controller;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
import com.dg.core.annotation.CurrentUser;
-import com.dg.core.db.gen.entity.ClassifyAdministration;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.service.IOrganizationChartService;
@@ -90,6 +88,11 @@
public ResultData deleteConfigById(@RequestParam(value = "Id",required = false) String Id)
{
Assert.notNull(Id, "Id 不能为空");
+ OrganizationChartEntity entity=iOrganizationChartService.selectConfigById(Id);
+ if(!StringUtils.isEmpty(entity.getParentId()))
+ {
+ return ResultData.error("该机构下存在其他部门！请先删除子部门");
+ }
return toAjax(iOrganizationChartService.deleteConfigById(Id));
}
@@ -133,7 +136,7 @@
* @param departmentId
* @return
*/
- @ApiOperation(value = "根据id查取消组织机构",response = OrganizationChartEntity.class)
+ @ApiOperation(value = "通过父级id查询对应机构下的全部部门",response = OrganizationChartEntity.class)
@GetMapping("/getdepartment")
public TableDataInfo getIds(@RequestParam(value = "department",required = false) String departmentId)
{
@@ -153,7 +156,6 @@
return getDataTable(ids);
}
-
//递归取id
private List<OrganizationChartEntity> disposestreetId(List<OrganizationChartEntity> lists)
{
@@ -172,8 +174,5 @@
}
return ids;
}
-
-
-
}
--
Gitblit v1.7.1