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 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 i roleDeptAddCmd.setDeptId(userDO.getDepartmentId()); List roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd); userAddCmd.setRoleDepts(roleDeptAddCmdList); + userAddCmd.setId(userDO.getId()); log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd)); SingleResponse 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