From db5ddc0fcc8b84eec9a955239ecc50e7e2918295 Mon Sep 17 00:00:00 2001
From: gaojie <gaojie@qq.com>
Date: Mon, 8 Jul 2019 16:58:02 +0800
Subject: [PATCH] fix

---
 .../com/ljsd/jieling/logic/friend/FriendLogic.java | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

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 dcf407631..c0b3ea05d 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
@@ -15,11 +15,17 @@ import com.ljsd.jieling.network.session.ISession;
 import com.ljsd.jieling.protocols.CommonProto;
 import com.ljsd.jieling.protocols.MessageTypeProto;
 import com.ljsd.jieling.protocols.PlayerInfoProto;
-import com.ljsd.jieling.util.*;
+import com.ljsd.jieling.util.CBean2Proto;
+import com.ljsd.jieling.util.ItemUtil;
+import com.ljsd.jieling.util.MessageUtil;
+import com.ljsd.jieling.util.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 public class FriendLogic {
@@ -472,9 +478,9 @@ public class FriendLogic {
         int type = 1;
         int friendId = Integer.parseInt(friend.toString());
         List<Integer> applyFriends = UserManager.getUser(friendId).getFriendManager().getApplyFriends();
-        if (friends.contains(uid)){
+        if (friends.contains(friendId)){
             type = 2;
-        }else if (applyFriends.contains(uid)){
+        }else if (applyFriends.contains(friendId)){
             type = 3;
         }
         PlayerInfoProto.FriendSearchResponse friendSearchResponse = PlayerInfoProto.FriendSearchResponse