Merge remote-tracking branch 'origin/main' into main

dev_xiangguanfang
SondonYong 2025-12-31 13:50:53 +08:00
commit e32a00640d
1 changed files with 7 additions and 19 deletions

View File

@ -466,29 +466,17 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
return Response.buildFailure("原密码不正确"); return Response.buildFailure("原密码不正确");
} }
} }
UserDO oldUserDO = getById(userDO.getId());
//修改多个密码 //修改多个密码
String phone = userDO.getPhone(); String phone = oldUserDO.getPhone();
if(StringUtils.isEmpty( phone)){
userChangePassword(userDO.getId(), userDO.getNewPassword()); List<UserDO> userDOList = getListByPhone( phone,null);
}else{ for (UserDO userDO1 : userDOList) {
List<UserDO> userDOList = getListByPhone( phone,null); //过滤出在职,离职审核人员
for (UserDO userDO1 : userDOList) { userChangePassword(userDO1.getId(), userDO.getNewPassword());
//过滤出在职,离职审核人员
userChangePassword(userDO1.getId(), userDO.getNewPassword());
}
} }
return Response.buildSuccess(); return Response.buildSuccess();
/* //更新本地密码
UserDO userDOUpdate = new UserDO();
userDOUpdate.setId(userDO.getId());
userDOUpdate.setPassword(userDO.getNewPassword());
updateById(userDOUpdate);
// 更新密码
UserUpdatePasswordCmd userUpdatePasswordCmd = new UserUpdatePasswordCmd();
userUpdatePasswordCmd.setId(userDO.getId());
userUpdatePasswordCmd.setPassword(userDO.getNewPassword());
return userFacade.updatePassword(userUpdatePasswordCmd);*/
} }
@Override @Override