From cb5741f487aee42aefe3bdc1213159275e2748f9 Mon Sep 17 00:00:00 2001
From: dengqichen <dengqichen@iscmtech.com>
Date: Fri, 28 Nov 2025 17:23:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=84=E5=BB=BA=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../backend/system/converter/UserConverter.java  |  4 ++++
 .../system/service/impl/UserServiceImpl.java     | 16 +++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/converter/UserConverter.java b/backend/src/main/java/com/qqchen/deploy/backend/system/converter/UserConverter.java
index dee3c324..b35d1cb0 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/system/converter/UserConverter.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/system/converter/UserConverter.java
@@ -13,6 +13,10 @@ import org.mapstruct.Mappings;
 public interface UserConverter extends BaseConverter<User, UserDTO> {
     // MapStruct 会自动实现所有方法
 
+    @Override
+    @Mapping(target = "department", ignore = true)
+    User toEntity(UserDTO dto);
+
     @Mapping(target = "token", ignore = true)
     @Mapping(target = "roles", ignore = true)
     @Mapping(target = "permissions", ignore = true)
diff --git a/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java b/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java
index 5dedd982..b21acef6 100644
--- a/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java
+++ b/backend/src/main/java/com/qqchen/deploy/backend/system/service/impl/UserServiceImpl.java
@@ -80,7 +80,21 @@ public class UserServiceImpl extends BaseServiceImpl<User, UserDTO, UserQuery, L
             dto.setPassword(PasswordGenerator.encode("123456"));
             log.info("用户 {} 未设置密码，使用默认密码: 123456", dto.getUsername());
         }
-        return super.create(dto);
+        
+        // 转换为实体
+        validateUniqueConstraints(dto);
+        User entity = userConverter.toEntity(dto);
+        
+        // 设置部门
+        if (dto.getDepartmentId() != null) {
+            Department department = departmentRepository.findById(dto.getDepartmentId())
+                .orElseThrow(() -> new BusinessException(ResponseCode.DEPARTMENT_NOT_FOUND));
+            entity.setDepartment(department);
+        }
+        
+        // 保存并返回
+        User savedEntity = userRepository.save(entity);
+        return userConverter.toDto(savedEntity);
     }
 
     @Override