Commit 33fd9806 authored by 赵浩琳's avatar 赵浩琳

修改手机号记录判空

parent d923239a
...@@ -458,6 +458,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -458,6 +458,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
@Override @Override
public UserModifyPhoneRecordResp getLastRecord(Long userId) { public UserModifyPhoneRecordResp getLastRecord(Long userId) {
UserModifyPhoneRecord lastRecord = modifyPhoneRecordRepository.findLastRecord(userId); UserModifyPhoneRecord lastRecord = modifyPhoneRecordRepository.findLastRecord(userId);
if (Objects.nonNull(lastRecord)) {
UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp(); UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
userModifyPhoneRecordResp.setId(lastRecord.getId()); userModifyPhoneRecordResp.setId(lastRecord.getId());
userModifyPhoneRecordResp.setUserId(lastRecord.getUserId()); userModifyPhoneRecordResp.setUserId(lastRecord.getUserId());
...@@ -467,6 +468,9 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -467,6 +468,9 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
userModifyPhoneRecordResp.setRemark(lastRecord.getRemark()); userModifyPhoneRecordResp.setRemark(lastRecord.getRemark());
userModifyPhoneRecordResp.setOperationAt(lastRecord.getCreatedAt()); userModifyPhoneRecordResp.setOperationAt(lastRecord.getCreatedAt());
return userModifyPhoneRecordResp; return userModifyPhoneRecordResp;
} else {
return null;
}
} }
@Override @Override
...@@ -494,6 +498,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -494,6 +498,7 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
public UserModifyPhoneRecordResp modifyRecord(String prevPhoneNo) { public UserModifyPhoneRecordResp modifyRecord(String prevPhoneNo) {
String ciphertext = AESUtils.encryptV2(prevPhoneNo); String ciphertext = AESUtils.encryptV2(prevPhoneNo);
UserModifyPhoneRecord userModifyPhoneRecord = modifyPhoneRecordRepository.modifyRecord(ciphertext); UserModifyPhoneRecord userModifyPhoneRecord = modifyPhoneRecordRepository.modifyRecord(ciphertext);
if (Objects.nonNull(userModifyPhoneRecord)) {
UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp(); UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
userModifyPhoneRecordResp.setId(userModifyPhoneRecord.getId()); userModifyPhoneRecordResp.setId(userModifyPhoneRecord.getId());
userModifyPhoneRecordResp.setUserId(userModifyPhoneRecord.getUserId()); userModifyPhoneRecordResp.setUserId(userModifyPhoneRecord.getUserId());
...@@ -504,8 +509,12 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -504,8 +509,12 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
userModifyPhoneRecordResp.setCreatedAt(userModifyPhoneRecord.getCreatedAt()); userModifyPhoneRecordResp.setCreatedAt(userModifyPhoneRecord.getCreatedAt());
userModifyPhoneRecordResp.setApplySource(userModifyPhoneRecord.getApplySource()); userModifyPhoneRecordResp.setApplySource(userModifyPhoneRecord.getApplySource());
userModifyPhoneRecordResp.setApplyStatus(userModifyPhoneRecord.getApplyStatus()); userModifyPhoneRecordResp.setApplyStatus(userModifyPhoneRecord.getApplyStatus());
userModifyPhoneRecordResp.setApplyStatusReason(userModifyPhoneRecord.getApplyStatusReason()); userModifyPhoneRecordResp.setApplyStatusReason(
userModifyPhoneRecord.getApplyStatusReason());
return userModifyPhoneRecordResp; return userModifyPhoneRecordResp;
} else {
return null;
}
} }
private Pageable getPageable(int currentPage, int pageSize) { private Pageable getPageable(int currentPage, int pageSize) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment