From 226198c102b007667cafbf81b30ec86f076c8257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Mon, 25 May 2026 14:12:57 +0800
Subject: [PATCH] =?UTF-8?q?refactor(department):=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9B=B4=E6=96=B0=E4=B8=8E=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉禁止修改AD域同步部门的校验逻辑
- 移除创建部门时自动生成sourceId的逻辑
- 更新部门时仅当source为0时允许修改名称、父id和sourceId
- 优化部门更新代码结构，提高代码清晰度
---
 .../service/DepartmentControllerService.java  |  2 +-
 .../service/impl/DepartmentServiceImpl.java   | 19 ++++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java
index afb22129..96059167 100644
--- a/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java
+++ b/nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/DepartmentControllerService.java
@@ -51,7 +51,7 @@ public class DepartmentControllerService {
     public void update(DepartmentUpdateQO request) {
         Department department = deptService.getById(request.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(department)).throwMessage("部门不存在");
-        VUtil.trueThrowBusinessError(Objects.equals(department.getSource(), 1)).throwMessage("不能修改从AD域同步的部门信息");
+//        VUtil.trueThrowBusinessError(Objects.equals(department.getSource(), 1)).throwMessage("不能修改从AD域同步的部门信息");
         VUtil.trueThrowBusinessError(deptService.lambdaQuery()
                         .eq(Department::getParentId, request.getParentId())
                         .eq(Department::getName, request.getName())
diff --git a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java
index 70cbe507..a64ce8cb 100644
--- a/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java
+++ b/nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/DepartmentServiceImpl.java
@@ -28,9 +28,8 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
- *
  * @author 代码生成器生成
  * @since 2025
  */
@@ -46,7 +45,6 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         Department department = new Department()
                 .setName(request.getName())
                 .setSource(0)
-                .setSourceId(Optional.ofNullable(request.getNo()).orElse(RandomUtil.randomString(10)))
                 .setParentId(request.getParentId())
                 .setEnable(request.getEnable())
                 .setCreateBy(UserUtil.getUserName())
@@ -68,17 +66,16 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         Department dept1 = getById(request.getId());
         VUtil.trueThrowBusinessError(Objects.isNull(dept1)).throwMessage("部门不存在");
         Department dept2 = new Department()
-                .setName(request.getName())
-                .setParentId(request.getParentId())
+                .setId(dept1.getId())
                 .setUpdateBy(UserUtil.getUserName())
                 .setUpdateTime(LocalDateTime.now())
-                .setId(dept1.getId())
-                .setSource(dept1.getSource())
-                .setEnable(request.getEnable())
-                .setCreateBy(dept1.getCreateBy())
-                .setCreateTime(dept1.getCreateTime())
-                .setSourceId(request.getNo());
+                .setEnable(request.getEnable());
 
+        if (dept1.getSource() == 0) {
+            dept2.setName(request.getName());
+            dept2.setSourceId(dept1.getSourceId());
+            dept2.setParentId(request.getParentId());
+        }
 
         //Department dept2 = BeanUtil.copy(dept1, Department.class);
 //        dept2.setName(request.getName())