From 774ac43c47d82d2b581c2c846a1dfc7b9ec46e64 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 25 Feb 2026 16:08:11 +0800
Subject: [PATCH] 机构，角色，用户 新增 sysType 字段
---
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 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 e577702..b1d5c4b 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
@@ -324,7 +321,27 @@
public void importDept(List<DeptImportExcel> data, Boolean isCovered) {
List<Dept> list = new ArrayList<>();
data.forEach(deptExcel -> {
+ // 校验必填字段
+ if (deptExcel.getDeptName() == null || deptExcel.getDeptName().trim().isEmpty()) {
+ throw new RuntimeException("机构名称不能为空");
+ }
+ if (deptExcel.getAreaCode() == null || deptExcel.getAreaCode().trim().isEmpty()) {
+ throw new RuntimeException("所属区划编码不能为空");
+ }
+ if (deptExcel.getRemark() == null || deptExcel.getRemark().trim().isEmpty()) {
+ throw new RuntimeException("机构描述不能为空");
+ }
+ if (deptExcel.getStatus() == null || deptExcel.getStatus().trim().isEmpty()) {
+ throw new RuntimeException("机构状态不能为空");
+ }
+ // 转换数据
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);
list.add(dept);
});
if (isCovered) {
--
Gitblit v1.9.3