pc端 相关方可以新增已离职人员,修改底座，先传入id

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());
             //修改

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