From 30f5df84d4e0d55fb5dfcf1e1424f490f6746e80 Mon Sep 17 00:00:00 2001
From: luotaiqian <1147642922@qq.com>
Date: Tue, 4 Aug 2026 17:17:53 +0800
Subject: [PATCH] person

---
 .../executor/QualFilingExpertExecutor.java    | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java
index 14833b6..137f51a 100644
--- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java
+++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/QualFilingExpertExecutor.java
@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.qinan.safetyeval.client.api.QualFilingExpertApi;
 import org.qinan.safetyeval.client.co.QualFilingExpertCO;
 import org.qinan.safetyeval.client.dto.*;
+import org.qinan.safetyeval.domain.entity.OrgPersonnelEntity;
 import org.qinan.safetyeval.domain.entity.QualFilingExpertEntity;
 import org.qinan.safetyeval.domain.query.PageResult;
 import org.qinan.safetyeval.domain.query.QualFilingExpertQuery;
@@ -60,20 +61,7 @@ public class QualFilingExpertExecutor implements QualFilingExpertApi {
     @Transactional(rollbackFor = Exception.class)
     public SingleResponse<QualFilingExpertCO> add(QualFilingExpertAddCmd cmd) {
         // 添加底座用户
-        UserAddCmd userAddCmd = new UserAddCmd();
-        userAddCmd.setAccount(cmd.getAccount());
-        userAddCmd.setTenantId(AuthContext.getTenantId());
-        userAddCmd.setName(cmd.getUserName());
-        String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey);
-        userAddCmd.setPassword(encrypt);
-
-        RoleDeptAddCmd roleDept = new RoleDeptAddCmd();
-        roleDept.setRoleCode(authRoleCodeExpert);
-        roleDept.setDeptId(expertDeptId);
-        userAddCmd.setRoleDepts(Collections.singletonList(roleDept));
-
-        Long userId = systemRemote.addUserIfAbsentAndAppendRole(userAddCmd
-                , Collections.singletonList(authRoleCodeExpert));
+        Long userId = addUserIfAbsentAndAppendRole(cmd);
 
         // 添加专家
         QualFilingExpertEntity entity = new QualFilingExpertEntity();
@@ -88,6 +76,29 @@ public class QualFilingExpertExecutor implements QualFilingExpertApi {
         return SingleResponse.success(toCO(result));
     }
 
+    /**
+     * addUserIfAbsentAndAppendRole
+     *
+     * @return Long
+     */
+    public Long addUserIfAbsentAndAppendRole(QualFilingExpertAddCmd personnelEntity) {
+        // 添加底座用户
+        UserAddCmd userAddCmd = new UserAddCmd();
+        userAddCmd.setAccount(personnelEntity.getAccount());
+        userAddCmd.setTenantId(AuthContext.getTenantId());
+        userAddCmd.setName(personnelEntity.getUserName());
+        String encrypt = Sm2Util.encryptHex(MD5.md5(defPassword), publicKey);
+        userAddCmd.setPassword(encrypt);
+
+        RoleDeptAddCmd roleDept = new RoleDeptAddCmd();
+        roleDept.setRoleCode(authRoleCodeExpert);
+        roleDept.setDeptId(expertDeptId);
+        userAddCmd.setRoleDepts(Collections.singletonList(roleDept));
+
+        return systemRemote.addUserIfAbsentAndAppendRole(userAddCmd
+                , Collections.singletonList(authRoleCodeExpert));
+    }
+
     @Override
     public SingleResponse<QualFilingExpertCO> get(Long id) {
         QualFilingExpertEntity entity = qualFilingExpertDomainService.get(id);