From 0e2a59c9b6fd4e91bfa1058f2e10baedc5776b52 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Sat, 17 Jan 2026 16:04:21 +0800
Subject: [PATCH] =?UTF-8?q?pc=E7=AB=AF=20=E7=9B=B8=E5=85=B3=E6=96=B9?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=96=B0=E5=A2=9E=E5=B7=B2=E7=A6=BB=E8=81=8C?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98,=E4=BF=AE=E6=94=B9=E5=BA=95=E5=BA=A7?=
 =?UTF-8?q?=EF=BC=8C=E5=85=88=E4=BC=A0=E5=85=A5id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/impl/UserRepositoryImpl.java   | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
index 08c344bf..e2a2d430 100644
--- a/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
+++ b/web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java
@@ -290,13 +290,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         if (StringUtils.isEmpty(userDO.getUsername())) {
             userDO.setUsername(userDO.getPhone());
         }
-        //userDO.setId(gbsResult.getData());
-        if (userDO.getSort() == null) {
-            userDO.setSort(9999);
-        }
-        // 新增用户默认在职
-        userDO.setEmploymentFlag(1);
-        save(userDO);
+
 
         UserAddCmd userAddCmd = new UserAddCmd();
         userAddCmd.setAccount(userDO.getUsername());
@@ -306,14 +300,19 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
         List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
         userAddCmd.setRoleDepts(roleDeptAddCmdList);
-        userAddCmd.setId(userDO.getId());
         log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
         SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
         log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
         if (!gbsResult.isSuccess()) {
             throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
         }
-
+        userDO.setId(gbsResult.getData());
+        if (userDO.getSort() == null) {
+            userDO.setSort(9999);
+        }
+        // 新增用户默认在职
+        userDO.setEmploymentFlag(1);
+        save(userDO);
     }
 
     @Override
@@ -354,7 +353,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         if (StringUtils.isEmpty(userDO.getUsername())) {
             userDO.setUsername(userDO.getPhone());
         }
+//        userDO.setId(gbsResult.getData());
 
+        if (userDO.getSort() == null) {
+            userDO.setSort(9999);
+        }
+        save(userDO);
         UserAddCmd userAddCmd = new UserAddCmd();
         userAddCmd.setAccount(userDO.getUsername());
         userAddCmd.setName(userDO.getName());
@@ -363,18 +367,14 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
         List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
         userAddCmd.setRoleDepts(roleDeptAddCmdList);
+        userAddCmd.setId(userDO.getId());
         log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
         SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
         log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
         if (!gbsResult.isSuccess()) {
             throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
         }
-        userDO.setId(gbsResult.getData());
 
-        if (userDO.getSort() == null) {
-            userDO.setSort(9999);
-        }
-        save(userDO);
     }
 
     @Override