From 0036bd64e14c1c3042cdfaa24e2cc008ee37f6c5 Mon Sep 17 00:00:00 2001
From: zhanglei <xx@cenxi.online>
Date: Thu, 9 Jul 2026 09:52:18 +0800
Subject: [PATCH] bug

---
 .../app/executor/OrgDepartmentExecutor.java   | 29 ++++++++++++++-----
 .../gatewayimpl/OrgDepartmentGatewayImpl.java |  2 +-
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java
index df33981..d4e3c07 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgDepartmentExecutor.java
@@ -58,14 +58,27 @@ public class OrgDepartmentExecutor implements OrgDepartmentApi {
     @Override
     public SingleResponse<OrgDepartmentCO> modify(OrgDepartmentModifyCmd cmd) {
         OrgDepartmentEntity entity = new OrgDepartmentEntity();
-        entity.setId(cmd.getId() != null ? Long.parseLong(cmd.getId()) : null);
-        entity.setParentId(cmd.getParentId() != null ? Long.parseLong(cmd.getParentId()) : null);
-        entity.setDeptName(cmd.getDeptName());
-        entity.setManagerName(cmd.getManagerName());
-        entity.setManagerAccount(cmd.getManagerAccount());
-        entity.setDeptLevelCode(cmd.getDeptLevelCode());
-        entity.setDeptLevelName(cmd.getDeptLevelName());
-
+        if (cmd.getId() != null) {
+            entity.setId(Long.parseLong(cmd.getId()));
+        }
+        if (entity.getParentId() != null) {
+            entity.setParentId(Long.parseLong(cmd.getParentId()));
+        }
+        if(cmd.getDeptName() != null) {
+            entity.setDeptName(cmd.getDeptName());
+        }
+        if (cmd.getManagerName() != null) {
+            entity.setManagerName(cmd.getManagerName());
+        }
+        if (cmd.getManagerAccount() != null) {
+            entity.setManagerAccount(cmd.getManagerAccount());
+        }
+        if (cmd.getDeptLevelCode() != null) {
+            entity.setDeptLevelCode(cmd.getDeptLevelCode());
+        }
+        if (cmd.getDeptLevelName() != null) {
+            entity.setDeptLevelName(cmd.getDeptLevelName());
+        }
         OrgDepartmentEntity result = orgDepartmentDomainService.modify(entity);
         return SingleResponse.success(toCO(result));
     }
diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgDepartmentGatewayImpl.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgDepartmentGatewayImpl.java
index 6dad5f5..238aa77 100644
--- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgDepartmentGatewayImpl.java
+++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/OrgDepartmentGatewayImpl.java
@@ -98,7 +98,7 @@ public class OrgDepartmentGatewayImpl implements OrgDepartmentGateway {
     private OrgDepartmentDO toDO(OrgDepartmentEntity entity) {
         OrgDepartmentDO dataObject = new OrgDepartmentDO();
         dataObject.setOrgId(orgContextResolver.resolveOrgId(entity.getOrgId()));
-        dataObject.setParentId(entity.getParentId() != null ? entity.getParentId() : 0L);
+        dataObject.setParentId(entity.getParentId());
         dataObject.setDeptName(entity.getDeptName());
         dataObject.setManagerName(entity.getManagerName());
         dataObject.setManagerAccount(entity.getManagerAccount());