fix enable/disable notice

luoo_comment/src/main/java/com/luoo/comment/pojo/UserInfo.java

@@ -140,9 +140,9 @@ public class UserInfo implements Serializable {
 	/**
 	 * 是否启用通知
 	 */
-	private int enableNotice;
+	private Integer enableNotice;
 	/**
 	 * 是否启用推送
 	 */
-	private int enablePush;
+	private Integer enablePush;
 }

luoo_comment/src/main/java/com/luoo/comment/service/CommentService.java

@@ -107,7 +107,7 @@ public class CommentService {
             commentHis.setJournalImage(parentComment.getJournalImage());
             commentHis.setCreateTime(new Date());
             UserInfo parentCommentUser =userInfoService.findById(parentComment.getUserId());
-            if (0 != parentCommentUser.getEnableNotice()) {
+            if (null ==parentCommentUser.getEnableNotice() || 1 == parentCommentUser.getEnableNotice()) {
                 commentHisDao.save(commentHis);
             }
 
@@ -139,7 +139,7 @@ public class CommentService {
             userMessageDto.setSendUserAvatar(Constants.RESOURCE_PREFIX+userLoginDto.getAvatar());
             userMessageDto.setSendUserId(userLoginDto.getUserId());
             userMessageDto.setSendUserNickName(userLoginDto.getNickName());
-            if (0 != parentCommentUser.getEnableNotice()) {
+            if (null ==parentCommentUser.getEnableNotice() || 1 == parentCommentUser.getEnableNotice()) {
                 rabbitTemplate.convertAndSend("userMessage",userMessageDto);
             }
 
@@ -241,7 +241,7 @@ public class CommentService {
 
         Comment parentComment = commentDao.findById(commentId).get();
         UserInfo parentCommentUser =userInfoService.findById(parentComment.getUserId());
-        if (0 != parentCommentUser.getEnableNotice()) {
+        if (null ==parentCommentUser.getEnableNotice() || 1 == parentCommentUser.getEnableNotice()) {
             /**
              * 向被点赞者发消息
              */

luoo_user/src/main/java/com/luoo/user/controller/MyController.java

@@ -123,11 +123,11 @@ public class MyController extends BaseController {
 		userRespDTO.setAppleEmail(user.getAppleEmail());
 		userRespDTO.setEnableNotice(1);
 		userRespDTO.setEnablePush(1);
-		if (0 ==user.getEnableNotice()) {
+		if (null != user.getEnableNotice()) {
-			userRespDTO.setEnableNotice(0);
+			userRespDTO.setEnableNotice(user.getEnableNotice());
 		}
-		if (0 == user.getEnablePush()) {
+		if (null != user.getEnablePush()) {
-			userRespDTO.setEnablePush(0);
+			userRespDTO.setEnablePush(user.getEnablePush());
 		}
 		return Result.success(userRespDTO);
 	}

luoo_user/src/main/java/com/luoo/user/dto/response/UserRespDTO.java

@@ -64,10 +64,10 @@ public class UserRespDTO implements Serializable {
 	 * 是否启用通知
 	 */
 	@ApiModelProperty(value = "是否启用通知，0为关闭，1为启用，默认启用")
-	private int enableNotice;
+	private Integer enableNotice;
 	/**
 	 * 是否启用推送
 	 */
 	@ApiModelProperty(value = "是否启用推送，0为关闭，1为启用，默认启用")
-	private int enablePush;
+	private Integer enablePush;
 }

luoo_user/src/main/java/com/luoo/user/pojo/UserInfo.java

@@ -164,9 +164,9 @@ public class UserInfo implements Serializable {
 	/**
 	 * 是否启用通知
 	 */
-	private int enableNotice;
+	private Integer enableNotice;
 	/**
 	 * 是否启用推送
 	 */
-	private int enablePush;
+	private Integer enablePush;
 }

luoo_user/src/main/java/com/luoo/user/service/UserCollectInfoService.java

@@ -279,7 +279,7 @@ public class UserCollectInfoService {
 		// 向他人发送 新粉丝 消息
 
 		UserInfo followUserInfo =userInfoDao.findById(objectId).get();
-		if (0 != followUserInfo.getEnableNotice()) {
+		if (null == followUserInfo.getEnableNotice() || 1== followUserInfo.getEnableNotice() ) {
 			sendMessageToFollows(user, objectId);
 		}