From d323ac1bcf18215d6f96c4db82319be745950fe7 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期五, 14 十月 2022 14:24:53 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into zigonggao_dev
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 38e281d..de7cf8c 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
@@ -6,7 +6,9 @@
import com.dg.core.annotation.CurrentUser;
import com.dg.core.db.gen.entity.OrganizationChartEntity;
import com.dg.core.db.gen.entity.SysUser;
+import com.dg.core.db.gen.entity.TransactionEvent;
import com.dg.core.service.IOrganizationChartService;
+import com.dg.core.service.ITransactionEventService;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -28,6 +30,9 @@
@Autowired(required = true)
IOrganizationChartService iOrganizationChartService;
+
+ @Autowired(required = true)
+ ITransactionEventService iTransactionEventService;
/**
* 查询机构列表
@@ -93,6 +98,15 @@
if(list!=null && list.size()>0)
{
return ResultData.error("该机构下存在其他部门！请先删除子部门");
+ }
+
+ List<String> ids=new ArrayList<>();
+ ids.add(Id);
+ List<TransactionEvent> transactionEvents=iTransactionEventService.selectConfigList(null,null,ids);
+
+ if(transactionEvents!=null && transactionEvents.size()>0)
+ {
+ return ResultData.error("该机构下已绑定办事指南！请解绑办事指南");
}
return toAjax(iOrganizationChartService.deleteConfigById(Id));
}
@@ -162,7 +176,6 @@
List<OrganizationChartEntity> ids=new ArrayList<>();
for (OrganizationChartEntity sysStreet:lists)
{
- ids.add(sysStreet);
if(sysStreet.getChild()!=null && sysStreet.getChild().size()>0)
{
ids.addAll(disposestreet(sysStreet.getChild()));
--
Gitblit v1.7.1