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

dahua_koumen
zhangxiongfeng 2026-08-03 10:52:11 +08:00
commit 85d55a77d9
2 changed files with 17 additions and 10 deletions

View File

@ -13,6 +13,7 @@ import java.util.stream.Collectors;
*/ */
@Getter @Getter
public enum CorpTypeEnum { public enum CorpTypeEnum {
// TODO 若修改默认密码通知前端同步修改
OrdinaryEnterprises(0,"普通企业",UserTypeEnum.QY.getCode(), "Bb@12345678"), OrdinaryEnterprises(0,"普通企业",UserTypeEnum.QY.getCode(), "Bb@12345678"),
groupUnits(1, "集团单位",UserTypeEnum.QY.getCode(), "Bb@12345678"), groupUnits(1, "集团单位",UserTypeEnum.QY.getCode(), "Bb@12345678"),
share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"), share(2,"股份单位",UserTypeEnum.JG.getCode(), "Aa@12345678"),

View File

@ -489,15 +489,11 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
@Override @Override
public void changePassword(Long id, String password) { public void changePassword(Long id, String password) {
//修改这个手机号下所有密码
UserDO userDO = getById(id); UserDO userDO = getById(id);
if (userDO == null) { if (userDO == null) {
return; return;
} }
String phone = userDO.getPhone(); for (UserDO userDO1 : listUsersForPasswordUpdate(userDO)) {
List<UserDO> userDOList = getListByPhone(phone, null);
for (UserDO userDO1 : userDOList) {
userChangePassword(userDO1.getId(), password); userChangePassword(userDO1.getId(), password);
} }
} }
@ -630,17 +626,27 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
} }
} }
//修改多个密码 // 有手机号则同步修改同手机号账号,无手机号则只改当前账号
String phone = oldUserDO.getPhone(); for (UserDO userDO1 : listUsersForPasswordUpdate(oldUserDO)) {
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();
} }
/**
*
*/
private List<UserDO> listUsersForPasswordUpdate(UserDO userDO) {
if (StringUtils.hasText(userDO.getPhone())) {
List<UserDO> userDOList = getListByPhone(userDO.getPhone(), null);
if (CollUtil.isNotEmpty(userDOList)) {
return userDOList;
}
}
return Collections.singletonList(userDO);
}
@Override @Override
public Boolean updateFaceUrl(UserDO userDO) { public Boolean updateFaceUrl(UserDO userDO) {
return updateById(userDO); return updateById(userDO);