修改手机号记录判空

src/main/java/cn/quantgroup/xyqb/service/user/impl/ModifyPhoneNoServiceImpl.java

@@ -458,15 +458,19 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
     @Override
     public UserModifyPhoneRecordResp getLastRecord(Long userId) {
         UserModifyPhoneRecord lastRecord = modifyPhoneRecordRepository.findLastRecord(userId);
-        UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
-        userModifyPhoneRecordResp.setId(lastRecord.getId());
-        userModifyPhoneRecordResp.setUserId(lastRecord.getUserId());
-        userModifyPhoneRecordResp.setPrevPhoneNo(lastRecord.getPrevPhoneNo());
-        userModifyPhoneRecordResp.setCurPhoneNo(lastRecord.getCurPhoneNo());
-        userModifyPhoneRecordResp.setReason(lastRecord.getReason().name());
-        userModifyPhoneRecordResp.setRemark(lastRecord.getRemark());
-        userModifyPhoneRecordResp.setOperationAt(lastRecord.getCreatedAt());
-        return userModifyPhoneRecordResp;
+        if (Objects.nonNull(lastRecord)) {
+            UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
+            userModifyPhoneRecordResp.setId(lastRecord.getId());
+            userModifyPhoneRecordResp.setUserId(lastRecord.getUserId());
+            userModifyPhoneRecordResp.setPrevPhoneNo(lastRecord.getPrevPhoneNo());
+            userModifyPhoneRecordResp.setCurPhoneNo(lastRecord.getCurPhoneNo());
+            userModifyPhoneRecordResp.setReason(lastRecord.getReason().name());
+            userModifyPhoneRecordResp.setRemark(lastRecord.getRemark());
+            userModifyPhoneRecordResp.setOperationAt(lastRecord.getCreatedAt());
+            return userModifyPhoneRecordResp;
+        } else {
+            return null;
+        }
     }
 
     @Override
@@ -494,18 +498,23 @@ public class ModifyPhoneNoServiceImpl implements IModifyPhoneNoService {
     public UserModifyPhoneRecordResp modifyRecord(String prevPhoneNo) {
         String ciphertext = AESUtils.encryptV2(prevPhoneNo);
         UserModifyPhoneRecord userModifyPhoneRecord = modifyPhoneRecordRepository.modifyRecord(ciphertext);
-        UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
-        userModifyPhoneRecordResp.setId(userModifyPhoneRecord.getId());
-        userModifyPhoneRecordResp.setUserId(userModifyPhoneRecord.getUserId());
-        userModifyPhoneRecordResp.setPrevPhoneNo(userModifyPhoneRecord.getPrevPhoneNo());
-        userModifyPhoneRecordResp.setCurPhoneNo(userModifyPhoneRecord.getCurPhoneNo());
-        userModifyPhoneRecordResp.setReason(userModifyPhoneRecord.getReason().name());
-        userModifyPhoneRecordResp.setRemark(userModifyPhoneRecord.getRemark());
-        userModifyPhoneRecordResp.setCreatedAt(userModifyPhoneRecord.getCreatedAt());
-        userModifyPhoneRecordResp.setApplySource(userModifyPhoneRecord.getApplySource());
-        userModifyPhoneRecordResp.setApplyStatus(userModifyPhoneRecord.getApplyStatus());
-        userModifyPhoneRecordResp.setApplyStatusReason(userModifyPhoneRecord.getApplyStatusReason());
-        return userModifyPhoneRecordResp;
+        if (Objects.nonNull(userModifyPhoneRecord)) {
+            UserModifyPhoneRecordResp userModifyPhoneRecordResp = new UserModifyPhoneRecordResp();
+            userModifyPhoneRecordResp.setId(userModifyPhoneRecord.getId());
+            userModifyPhoneRecordResp.setUserId(userModifyPhoneRecord.getUserId());
+            userModifyPhoneRecordResp.setPrevPhoneNo(userModifyPhoneRecord.getPrevPhoneNo());
+            userModifyPhoneRecordResp.setCurPhoneNo(userModifyPhoneRecord.getCurPhoneNo());
+            userModifyPhoneRecordResp.setReason(userModifyPhoneRecord.getReason().name());
+            userModifyPhoneRecordResp.setRemark(userModifyPhoneRecord.getRemark());
+            userModifyPhoneRecordResp.setCreatedAt(userModifyPhoneRecord.getCreatedAt());
+            userModifyPhoneRecordResp.setApplySource(userModifyPhoneRecord.getApplySource());
+            userModifyPhoneRecordResp.setApplyStatus(userModifyPhoneRecord.getApplyStatus());
+            userModifyPhoneRecordResp.setApplyStatusReason(
+                userModifyPhoneRecord.getApplyStatusReason());
+            return userModifyPhoneRecordResp;
+        } else {
+            return null;
+        }
     }
 
     private Pageable getPageable(int currentPage, int pageSize) {