diff --git a/src/main/java/com/ifish/action/UpdateUserAction.java b/src/main/java/com/ifish/action/UpdateUserAction.java index 05bfc13..3a7f7ee 100644 --- a/src/main/java/com/ifish/action/UpdateUserAction.java +++ b/src/main/java/com/ifish/action/UpdateUserAction.java @@ -8,6 +8,7 @@ import com.ifish.service.BaseService; import com.ifish.service.PageListService; import com.ifish.service.UserService; import com.ifish.util.IfishUtil; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -87,6 +88,10 @@ public class UpdateUserAction { @RequestMapping(value = "/bindDevice.do") @ResponseBody public Object bindDevice(@RequestParam String deviceId,@RequestParam Integer userId,@RequestParam String phoneType, @RequestParam(required = false) Integer type){ + System.out.println("bindDevice ----- " + deviceId + "\t" + userId + "\t" + phoneType + "\t" + type); + if (StringUtils.isBlank(deviceId)) { + return IfishUtil.returnJson(ResultEnum.success.getKey(), ""); + } AliyunDeviceInfo aliyunDeviceInfo = baseService.getAliyunDeviceInfoByUserId(userId); if (aliyunDeviceInfo == null) { aliyunDeviceInfo = new AliyunDeviceInfo(); @@ -102,6 +107,11 @@ public class UpdateUserAction { } return baseService.saveAliyunDeviceInfo(aliyunDeviceInfo); } else { + if (type != null) { + aliyunDeviceInfo.setType(type); + } else { + aliyunDeviceInfo.setType(0); + } aliyunDeviceInfo.setUserId(userId); aliyunDeviceInfo.setPhoneType(phoneType); aliyunDeviceInfo.setLastUpdateTime(new Date());