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

修改手机号记录判空

parent d923239a
...@@ -458,15 +458,19 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -458,15 +458,19 @@ 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);
UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp(); if (Objects.nonNull(lastRecord)) {
userModifyPhoneRecordResp.setId(lastRecord.getId()); UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
userModifyPhoneRecordResp.setUserId(lastRecord.getUserId()); userModifyPhoneRecordResp.setId(lastRecord.getId());
userModifyPhoneRecordResp.setPrevPhoneNo(lastRecord.getPrevPhoneNo()); userModifyPhoneRecordResp.setUserId(lastRecord.getUserId());
userModifyPhoneRecordResp.setCurPhoneNo(lastRecord.getCurPhoneNo()); userModifyPhoneRecordResp.setPrevPhoneNo(lastRecord.getPrevPhoneNo());
userModifyPhoneRecordResp.setReason(lastRecord.getReason().name()); userModifyPhoneRecordResp.setCurPhoneNo(lastRecord.getCurPhoneNo());
userModifyPhoneRecordResp.setRemark(lastRecord.getRemark()); userModifyPhoneRecordResp.setReason(lastRecord.getReason().name());
userModifyPhoneRecordResp.setOperationAt(lastRecord.getCreatedAt()); userModifyPhoneRecordResp.setRemark(lastRecord.getRemark());
return userModifyPhoneRecordResp; userModifyPhoneRecordResp.setOperationAt(lastRecord.getCreatedAt());
return userModifyPhoneRecordResp;
} else {
return null;
}
} }
@Override @Override
...@@ -494,18 +498,23 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService { ...@@ -494,18 +498,23 @@ 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);
UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp(); if (Objects.nonNull(userModifyPhoneRecord)) {
userModifyPhoneRecordResp.setId(userModifyPhoneRecord.getId()); UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
userModifyPhoneRecordResp.setUserId(userModifyPhoneRecord.getUserId()); userModifyPhoneRecordResp.setId(userModifyPhoneRecord.getId());
userModifyPhoneRecordResp.setPrevPhoneNo(userModifyPhoneRecord.getPrevPhoneNo()); userModifyPhoneRecordResp.setUserId(userModifyPhoneRecord.getUserId());
userModifyPhoneRecordResp.setCurPhoneNo(userModifyPhoneRecord.getCurPhoneNo()); userModifyPhoneRecordResp.setPrevPhoneNo(userModifyPhoneRecord.getPrevPhoneNo());
userModifyPhoneRecordResp.setReason(userModifyPhoneRecord.getReason().name()); userModifyPhoneRecordResp.setCurPhoneNo(userModifyPhoneRecord.getCurPhoneNo());
userModifyPhoneRecordResp.setRemark(userModifyPhoneRecord.getRemark()); userModifyPhoneRecordResp.setReason(userModifyPhoneRecord.getReason().name());
userModifyPhoneRecordResp.setCreatedAt(userModifyPhoneRecord.getCreatedAt()); userModifyPhoneRecordResp.setRemark(userModifyPhoneRecord.getRemark());
userModifyPhoneRecordResp.setApplySource(userModifyPhoneRecord.getApplySource()); userModifyPhoneRecordResp.setCreatedAt(userModifyPhoneRecord.getCreatedAt());
userModifyPhoneRecordResp.setApplyStatus(userModifyPhoneRecord.getApplyStatus()); userModifyPhoneRecordResp.setApplySource(userModifyPhoneRecord.getApplySource());
userModifyPhoneRecordResp.setApplyStatusReason(userModifyPhoneRecord.getApplyStatusReason()); userModifyPhoneRecordResp.setApplyStatus(userModifyPhoneRecord.getApplyStatus());
return userModifyPhoneRecordResp; userModifyPhoneRecordResp.setApplyStatusReason(
userModifyPhoneRecord.getApplyStatusReason());
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