fix user logOff

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

@@ -518,15 +518,15 @@ public class MyController extends BaseController {
 		}
 
 		// 删除账号
-		UserInfo userInfo = userInfoService.findById(userId);
-		userInfo.setMobile("已注销");
-		userInfo.setAvatar(Constants.DEFAULT_USER_AVATAR);
-		userInfo.setWxId("");
-		userInfo.setAppleId("");
-		userInfo.setAppleEmail("");
-		userInfo.setWxNickname("");
-		userInfoService.update(userInfo);
-//		userInfoService.deleteById(userId);
+//		UserInfo userInfo = userInfoService.findById(userId);
+//		userInfo.setMobile("已注销");
+//		userInfo.setAvatar(Constants.DEFAULT_USER_AVATAR);
+//		userInfo.setWxId("");
+//		userInfo.setAppleId("");
+//		userInfo.setAppleEmail("");
+//		userInfo.setWxNickname("");
+//		userInfoService.update(userInfo);
+		userInfoService.deleteById(userId);
 		return Result.success();
 	}
 

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

@@ -85,19 +85,26 @@ public class UserMessageController extends BaseController {
         UserMessage userMessageComment = userMessageService.findByUseridAndType(userId,MessageTypeEnum.COMMENT.getType());// 评论
         UserMessage userMessageFollow = userMessageService.findByUseridAndType(userId,MessageTypeEnum.FOLLOW.getType());//
         UserMessage userMessageThumbup = userMessageService.findByUseridAndType(userId,MessageTypeEnum.THUMB_UP.getType());//
-        if (userMessageComment != null) {
+        if (null != userMessageComment) {
            UserInfo userInfo1 = userInfoService.findById(userMessageComment.getSendUserId());
-           userMessageComment.setContent(userInfo1.getNickName()+ " 回复了你的评论");
+           if(null !=  userInfo1) {
+               userMessageComment.setContent(userInfo1.getNickName() + " 回复了你的评论");
            }
-        if (userMessageFollow != null) {
+        }
+        if (null != userMessageFollow ) {
+
            UserInfo userInfo2 = userInfoService.findById(userMessageFollow.getSendUserId());
-            userMessageFollow.setContent(userInfo2.getNickName()+" 关注了你");
+            if(null !=  userInfo2) {
+                userMessageFollow.setContent(userInfo2.getNickName() + " 关注了你");
+            }
         }
 
-        if(userMessageThumbup !=null) {
+        if(null != userMessageThumbup) {
             UserInfo userInfo3 = userInfoService.findById(userMessageThumbup.getSendUserId());
+            if(null !=  userInfo3) {
             userMessageThumbup.setContent(userInfo3.getNickName()+ " 点赞了你的评论");
             }
+        }
         map.put("comment",userMessageComment);
         map.put("follow",userMessageFollow);
         map.put("thumbup",userMessageThumbup);