diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java
index cc20916..98c37fc 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java
@@ -62,6 +62,8 @@ public class AppUser extends BaseEntity
 
     private String schoolName;
 
+    private String search;
+
     /** 专业 */
     @Excel(name = "专业")
     private String major;
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
index d9b8a20..5c07dbe 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
@@ -275,7 +275,6 @@ public class AppUserServiceImpl implements IAppUserService {
         entity.setIsMember(appUser.getIsMember());
         entity.setAppId(appUser.getAppId());
         entity.setSchool(appUser.getSchool());
-        entity.setCompanyName(appUser.getCompanyName());
         // 学校
         List<AppUserDataVo> schoolList = appUserMapper.selectList(entity);
         Collections.shuffle(schoolList);
@@ -286,6 +285,7 @@ public class AppUserServiceImpl implements IAppUserService {
 
 
         entity.setSchool(null);
+        entity.setCompanyName(appUser.getCompanyName());
         // 公司
         List<AppUserDataVo> companylList = appUserMapper.selectList(entity);
         Collections.shuffle(companylList);
@@ -297,6 +297,7 @@ public class AppUserServiceImpl implements IAppUserService {
         // 好友的好友
         List<Long> friendIds = appUserFriendMapper.selectByFriendId(ids);
         entity.setFriendIds(friendIds);
+        entity.setCompanyName(null);
         List<AppUserDataVo> friendList = appUserMapper.selectList(entity);
         if (friendList == null || friendList.size() == 0) {
             entity.setFriendIds(null);
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
index 8ffaec2..c089f04 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
@@ -212,11 +212,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="appId != null "> and a.id != #{appId}</if>
         <if test="school != null  and school != ''"> and a.school = #{school}</if>
         <if test="companyName != null  and companyName != ''">
-            and (a.company_name like concat('%', #{companyName}, '%')
-                or a.username like concat('%', #{companyName}, '%')
-            or a.nickname like concat('%', #{companyName}, '%')
-            or a.major like concat('%', #{companyName}, '%')
-            or s.name like concat('%', #{companyName}, '%')
+            and a.company_name = #{companyName}
+        </if>
+        <if test="search != null  and search != ''">
+            and (a.company_name like concat('%', #{search}, '%')
+            or a.username like concat('%', #{search}, '%')
+            or a.nickname like concat('%', #{search}, '%')
+            or a.major like concat('%', #{search}, '%')
+            or s.name like concat('%', #{search}, '%')
             )
         </if>
         <if test="ids != null and ids.size()"> and a.id not in