From b486873000ea043f159c8de5c0edb123c0f38a87 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Tue, 09 Jun 2026 08:36:34 +0800
Subject: [PATCH] refactor(flyer): 修改飞手表单和实体类中的擅长任务类型字段
---
drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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 e182ed2..c04ff80 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
@@ -154,9 +154,16 @@
return removeByIds(Func.toLongList(ids));
}
+ /**
+ * 提交部门信息
+ *
+ * @param dept 部门信息
+ * @return 是否操作成功
+ */
@Override
public boolean submit(Dept dept) {
log.info("提交数据：{}", JSON.toJSONString(dept));
+ // 处理父节点信息
if (Func.isEmpty(dept.getParentId())) {
dept.setTenantId(AuthUtil.getTenantId());
dept.setParentId(BladeConstant.TOP_PARENT_ID);
@@ -171,9 +178,14 @@
String ancestors = parent.getAncestors() + StringPool.COMMA + dept.getParentId();
dept.setAncestors(ancestors);
}
- dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
- if (dept.getId() != null && dept.getId() > 0) {
- return updateById(dept);
+
+ // 处理ID重复问题：如果ID存在但记录不存在，设置ID为null让MyBatis-Plus重新生成
+ if (dept.getId() != null) {
+ Dept existingDept = getById(dept.getId());
+ if (existingDept != null) {
+ return updateById(dept);
+ }
+
}
return save(dept);
}
--
Gitblit v1.9.3