From 3eec84a28c462e95175935a4984fb4e47997e218 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Apr 2026 17:25:09 +0800
Subject: [PATCH] opt: 删除优化
---
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
index 0d8f0ee..653d16a 100644
--- a/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
+++ b/drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java
@@ -48,10 +48,7 @@
import org.sxkj.system.vo.DeptVO;
import org.sxkj.system.wrapper.DeptWrapper;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -96,8 +93,8 @@
@Override
- public List<DeptVO> tree(String tenantId) {
- return ForestNodeMerger.merge(baseMapper.tree(tenantId));
+ public List<DeptVO> tree(String tenantId, String sysType) {
+ return ForestNodeMerger.merge(baseMapper.tree(tenantId, sysType));
}
@Override
@@ -171,8 +168,10 @@
dept.setAncestors(ancestors);
}
dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
-
- return saveOrUpdate(dept);
+ if (dept.getId() > 0) {
+ return updateById(dept);
+ }
+ return save(dept);
}
@Override
@@ -339,6 +338,13 @@
}
// 转换数据
Dept dept = BeanUtil.copy(deptExcel, Dept.class);
+ dept.setStatus(1);
+ dept.setIsDeleted(0);
+ dept.setCreateTime(new Date());
+ dept.setUpdateTime(new Date());
+ dept.setDeptNature(2);
+ dept.setDeptCategory(2);
+ dept.setSysType(String.valueOf(6));
list.add(dept);
});
if (isCovered) {
--
Gitblit v1.9.3