From 1914923907fa3282b1eb35638cb0201e1f07556c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 18 十月 2022 17:05:49 +0800
Subject: [PATCH] 新增工单删除接口
---
flower_city/src/main/java/com/dg/core/controller/OrganizationController.java | 25 ++++++++++++++++++-------
1 files changed, 18 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 7efd705..2b59286 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;
/**
* 查询机构列表
@@ -75,7 +80,7 @@
public ResultData updateConfig(@RequestBody OrganizationChartEntity entity,@CurrentUser SysUser sysUser)
{
entity.setUpdateTime(LocalDateTime.now());
- entity.setUpdateUserId(Integer.parseInt(String.valueOf(sysUser.getUserId())));
+ entity.setUpdateUserId(sysUser.getUserId());
return toAjax(iOrganizationChartService.updateConfig(entity));
}
@@ -88,13 +93,20 @@
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("该机构下存在其他部门！请先删除子部门");
+ }
+
+ 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));
}
@@ -144,7 +156,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));
@@ -164,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