pc端 相关方可以新增已离职人员,修改底座,先传入id
parent
66ca7c57b2
commit
0e2a59c9b6
|
|
@ -290,13 +290,7 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
if (StringUtils.isEmpty(userDO.getUsername())) {
|
if (StringUtils.isEmpty(userDO.getUsername())) {
|
||||||
userDO.setUsername(userDO.getPhone());
|
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 userAddCmd = new UserAddCmd();
|
||||||
userAddCmd.setAccount(userDO.getUsername());
|
userAddCmd.setAccount(userDO.getUsername());
|
||||||
|
|
@ -306,14 +300,19 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
|
roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
|
||||||
List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
|
List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
|
||||||
userAddCmd.setRoleDepts(roleDeptAddCmdList);
|
userAddCmd.setRoleDepts(roleDeptAddCmdList);
|
||||||
userAddCmd.setId(userDO.getId());
|
|
||||||
log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
|
log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
|
||||||
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
|
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
|
||||||
log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
|
log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
|
||||||
if (!gbsResult.isSuccess()) {
|
if (!gbsResult.isSuccess()) {
|
||||||
throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
|
throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
|
||||||
}
|
}
|
||||||
|
userDO.setId(gbsResult.getData());
|
||||||
|
if (userDO.getSort() == null) {
|
||||||
|
userDO.setSort(9999);
|
||||||
|
}
|
||||||
|
// 新增用户默认在职
|
||||||
|
userDO.setEmploymentFlag(1);
|
||||||
|
save(userDO);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -354,7 +353,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
if (StringUtils.isEmpty(userDO.getUsername())) {
|
if (StringUtils.isEmpty(userDO.getUsername())) {
|
||||||
userDO.setUsername(userDO.getPhone());
|
userDO.setUsername(userDO.getPhone());
|
||||||
}
|
}
|
||||||
|
// userDO.setId(gbsResult.getData());
|
||||||
|
|
||||||
|
if (userDO.getSort() == null) {
|
||||||
|
userDO.setSort(9999);
|
||||||
|
}
|
||||||
|
save(userDO);
|
||||||
UserAddCmd userAddCmd = new UserAddCmd();
|
UserAddCmd userAddCmd = new UserAddCmd();
|
||||||
userAddCmd.setAccount(userDO.getUsername());
|
userAddCmd.setAccount(userDO.getUsername());
|
||||||
userAddCmd.setName(userDO.getName());
|
userAddCmd.setName(userDO.getName());
|
||||||
|
|
@ -363,18 +367,14 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
|
||||||
roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
|
roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
|
||||||
List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
|
List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
|
||||||
userAddCmd.setRoleDepts(roleDeptAddCmdList);
|
userAddCmd.setRoleDepts(roleDeptAddCmdList);
|
||||||
|
userAddCmd.setId(userDO.getId());
|
||||||
log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
|
log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
|
||||||
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
|
SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
|
||||||
log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
|
log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
|
||||||
if (!gbsResult.isSuccess()) {
|
if (!gbsResult.isSuccess()) {
|
||||||
throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
|
throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
|
||||||
}
|
}
|
||||||
userDO.setId(gbsResult.getData());
|
|
||||||
|
|
||||||
if (userDO.getSort() == null) {
|
|
||||||
userDO.setSort(9999);
|
|
||||||
}
|
|
||||||
save(userDO);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue