diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
index f80adbfa1..0ab2419fa 100644
--- a/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
+++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/friend/FriendLogic.java
@@ -309,9 +309,12 @@ public class FriendLogic {
         int uid = iSession.getUid();
         User user = UserManager.getUser(uid);
         FriendManager friendManager = user.getFriendManager();
-        User friendUser = UserManager.getUser(friendId);
-        FriendManager friendfriendManager = friendUser.getFriendManager();
-
+        User friendUser = null;
+        FriendManager friendfriendManager = null;
+        if(friendId!=0){
+            UserManager.getUser(friendId);
+            friendfriendManager = friendUser.getFriendManager();
+        }
         List<Integer> friends = friendManager.getFriends();
         List<Integer> applyFriends = friendManager.getApplyFriends();
         int maxFriends = SSpecialConfig.getIntegerValue(SSpecialConfig.FRIENDAMOUNT_LIMIT);
@@ -403,6 +406,7 @@ public class FriendLogic {
             friendManager.setApplyFriends(new CopyOnWriteArrayList<>());
             friendfriendManager.addFriendId(uid);
             friendManager.addFriendId(applyfriendId);
+            UserManager.getUser(applyfriendId).getFriendManager().delMyApplyFriend(uid);
             initFriendGriveAndRreward(applyfriendId, uid, friendManager, friendfriendManager);
             sendFriendInfoIndication(uid,applyfriendId,2);
             nums++;