From 725e1b88a8d86135741c3d715b7579735dfaf484 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 22 Apr 2026 16:29:45 +0800
Subject: [PATCH] fix: 删除机构异常

---
 drone-service/drone-system/src/main/java/org/sxkj/system/service/impl/DeptServiceImpl.java |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 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 ff2e938..fe2824d 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
@@ -156,7 +156,7 @@
 
 	/**
 	 * 提交部门信息
-	 * 
+	 *
 	 * @param dept 部门信息
 	 * @return 是否操作成功
 	 */
@@ -178,17 +178,16 @@
 			String ancestors = parent.getAncestors() + StringPool.COMMA + dept.getParentId();
 			dept.setAncestors(ancestors);
 		}
-		
+
 		// 处理ID重复问题:如果ID存在但记录不存在,设置ID为null让MyBatis-Plus重新生成
 		if (dept.getId() != null) {
 			Dept existingDept = getById(dept.getId());
-			if (existingDept == null) {
-				dept.setId(null);
+			if (existingDept != null) {
+				return updateById(dept);
 			}
+			return save(dept);
 		}
-		
-		dept.setIsDeleted(BladeConstant.DB_NOT_DELETED);
-		return saveOrUpdate(dept);
+		return false;
 	}
 
 	@Override

--
Gitblit v1.9.3