From 66ca7c57b2c4e809f83ec0713712283a2768b88d Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Sat, 17 Jan 2026 15:49:19 +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

---
 .../zcloud/basic/info/command/UserAddExe.java   |  8 +++-----
 .../repository/impl/UserRepositoryImpl.java     | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
index 16faa64f..136f861b 100644
--- a/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
+++ b/web-app/src/main/java/com/zcloud/basic/info/command/UserAddExe.java
@@ -514,11 +514,9 @@ public class UserAddExe {
             if (!res) {
                 throw new BizException("保存失败");
             }
-            //新增userExtandInfo
-            UserExpandInfoE userExpandInfoE = new UserExpandInfoE();
-            BeanUtils.copyProperties(userE, userExpandInfoE);
-            userExpandInfoE.initAdd(userE);
-            userExpandInfoGateway.add(userExpandInfoE);
+
+            userExpandInfoRepository.updateByPhone(cmd.getPhone(),cmd.getFlowFlag());
+
         } else {
             userGateway.updateXgf(userE, userDOUpdate.getId());
             //修改
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 dac21d6d..08c344bf 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,6 +290,14 @@ 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());
         userAddCmd.setName(userDO.getName());
@@ -298,19 +306,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);
-        }
-        // 新增用户默认在职
-        userDO.setEmploymentFlag(1);
-        save(userDO);
+
     }
 
     @Override