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 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 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 @@ -354,7 +353,12 @@ 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); + } + save(userDO); UserAddCmd userAddCmd = new UserAddCmd(); userAddCmd.setAccount(userDO.getUsername()); userAddCmd.setName(userDO.getName()); @@ -363,18 +367,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); - } - save(userDO); } @Override