dev: app修改信息同步底座校验、pc相关方修改信息同步底座校验

dev_xiangguanfang
SondonYong 2026-01-04 14:34:57 +08:00
parent ef4bc73242
commit cbd3de9a31
2 changed files with 62 additions and 21 deletions

View File

@ -207,6 +207,16 @@ public class UserAddExe {
// 底座同步修改姓名和邮箱 // 底座同步修改姓名和邮箱
if (StringUtils.isNotEmpty(userDO.getName())) { if (StringUtils.isNotEmpty(userDO.getName())) {
if (!userDO.getName().equals(cmd.getName()) || !userDO.getEmail().equals(cmd.getEmail())) { if (!userDO.getName().equals(cmd.getName()) || !userDO.getEmail().equals(cmd.getEmail())) {
// 判断底座是否有该用户信息,如果没有则不调用底座
SingleResponse<UserDetailCO> detail = null;
try {
log.info("updateXgf,GBS获取用户信息{}", userE.getId());
detail = userFacade.getDetail(cmd.getId());
log.info("updateXgf,GBS获取用户信息返回: {}", JSONUtil.toJsonStr(detail));
} catch (Exception e) {
log.error("updateXgf,GBS获取用户信息失败: {}", e.getMessage());
}
if(detail.getData() != null){
UserE u = new UserE(); UserE u = new UserE();
u.setId(cmd.getId()); u.setId(cmd.getId());
u.setName(cmd.getName()); u.setName(cmd.getName());
@ -215,6 +225,7 @@ public class UserAddExe {
userGateway.updateByAppGBS(u); userGateway.updateByAppGBS(u);
} }
} }
}
return true; return true;

View File

@ -112,16 +112,31 @@ public class UserUpdateExe {
// pc端当前相关方企业修改 // pc端当前相关方企业修改
boolean res = userGateway.update(userE); boolean res = userGateway.update(userE);
if(!userE.getPhone().equals(userDO.getPhone())){ if(!userE.getPhone().equals(userDO.getPhone())
|| !userE.getEmail().equals(userDO.getEmail())
|| !userE.getName().equals(userDO.getName())){
// 判断底座是否有该用户信息,如果没有则不调用底座
SingleResponse<UserDetailCO> detail = null;
try {
log.info("updateXgf,GBS获取用户信息{}", userE.getId());
detail = userFacade.getDetail(userE.getId());
log.info("updateXgf,GBS获取用户信息返回: {}", JSONUtil.toJsonStr(detail));
} catch (Exception e) {
log.error("updateXgf,GBS获取用户信息失败: {}", e.getMessage());
}
if(detail.getData() != null){
// 调用底座修改账号 // 调用底座修改账号
userGateway.updateByGBS(userE); userGateway.updateByGBS(userE);
// 重置密码 if(!userE.getPhone().equals(userDO.getPhone())){
// 修改账号了,需要重置密码
UserE u = new UserE(); UserE u = new UserE();
u.resetPassword(); u.resetPassword();
for (Long userId : userIds) { for (Long userId : userIds) {
userRepository.changePassword(userId, u.getPassword()); userRepository.changePassword(userId, u.getPassword());
} }
} }
}
}
// 相关方同步修改 // 相关方同步修改
boolean res2 = userGateway.updateByIds(userE, userIds); boolean res2 = userGateway.updateByIds(userE, userIds);
@ -132,14 +147,29 @@ public class UserUpdateExe {
}else { }else {
// 企业端/监管端 // 企业端/监管端
boolean res = userGateway.update(userE); boolean res = userGateway.update(userE);
if(!userE.getPhone().equals(userDO.getPhone())){ if(!userE.getPhone().equals(userDO.getPhone())
|| !userE.getEmail().equals(userDO.getEmail())
|| !userE.getName().equals(userDO.getName())){
// 判断底座是否有该用户信息,如果没有则不调用底座
SingleResponse<UserDetailCO> detail = null;
try {
log.info("updateXgf,GBS获取用户信息{}", userE.getId());
detail = userFacade.getDetail(userE.getId());
log.info("updateXgf,GBS获取用户信息返回: {}", JSONUtil.toJsonStr(detail));
} catch (Exception e) {
log.error("updateXgf,GBS获取用户信息失败: {}", e.getMessage());
}
if(detail.getData() != null){
// 调用底座修改账号 // 调用底座修改账号
userGateway.updateByGBS(userE); userGateway.updateByGBS(userE);
// 重置密码 if(!userE.getPhone().equals(userDO.getPhone())){
// 账号修改了,需要重置密码
UserE u = new UserE(); UserE u = new UserE();
u.resetPassword(); u.resetPassword();
userRepository.changePassword(userDO.getId(), u.getPassword()); userRepository.changePassword(userDO.getId(), u.getPassword());
} }
}
}
// 保存履职记录 // 保存履职记录
if (!res) { if (!res) {
throw new BizException("修改失败"); throw new BizException("修改失败");