diff --git a/src/main/java/com/ifish/action/UpdateUserAction.java b/src/main/java/com/ifish/action/UpdateUserAction.java index e738cd0..81ab6a0 100644 --- a/src/main/java/com/ifish/action/UpdateUserAction.java +++ b/src/main/java/com/ifish/action/UpdateUserAction.java @@ -102,6 +102,7 @@ public class UpdateUserAction { } } else { aliyunDeviceInfo.setUserId(userId); + aliyunDeviceInfo.setPhoneType(phoneType); aliyunDeviceInfo.setLastUpdateTime(new Date()); } return baseService.saveOrUpdateAliyunDeviceInfo(aliyunDeviceInfo); diff --git a/src/main/java/com/ifish/serviceImpl/AliyunDeviceInfoServiceImpl.java b/src/main/java/com/ifish/serviceImpl/AliyunDeviceInfoServiceImpl.java index d49ac0f..44ee4bf 100644 --- a/src/main/java/com/ifish/serviceImpl/AliyunDeviceInfoServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/AliyunDeviceInfoServiceImpl.java @@ -33,7 +33,7 @@ public class AliyunDeviceInfoServiceImpl implements AliyunDeviceInfoService { public AliyunDeviceInfo getAliyunDeviceInfoByUserId(Integer userId) { Criterion criterion = Restrictions.eq("userId", userId); List deviceInfos = aliyunDeviceInfoDao.findByProperty(criterion); - return deviceInfos.stream().findFirst().get(); + return deviceInfos.stream().findFirst().orElse(null); } @Override