From f67944e15a54fa13e19717e6efadc25235784c7c Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Thu, 23 May 2024 14:34:14 +0800
Subject: [PATCH] ~

---
 .../ruoyi/app/service/impl/AppUserServiceImpl.java    |  6 +-----
 .../src/main/resources/mapper/app/AppUserMapper.xml   | 11 ++++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

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 695b674..5994474 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
@@ -175,7 +175,7 @@ public class AppUserServiceImpl implements IAppUserService
         entity.setIsMember(appUser.getIsMember());
         entity.setAppId(appUser.getAppId());
         entity.setSchool(appUser.getSchool());
-        entity.setSchoolName(appUser.getCompanyName() == null ? null : appUser.getCompanyName());
+        entity.setCompanyName(appUser.getCompanyName());
         // 学校
         List<AppUserDataVo> schoolList = appUserMapper.selectList(entity);
         Collections.shuffle(schoolList);
@@ -186,8 +186,6 @@ public class AppUserServiceImpl implements IAppUserService
 
 
         entity.setSchool(null);
-        entity.setSchoolName(null);
-        entity.setCompanyName(appUser.getCompanyName());
         // 公司
         List<AppUserDataVo> companylList = appUserMapper.selectList(entity);
         Collections.shuffle(companylList);
@@ -198,8 +196,6 @@ public class AppUserServiceImpl implements IAppUserService
 
         // 好友的好友
         List<Long> friendIds = appUserFriendMapper.selectByFriendId(ids);
-        entity.setCompanyName(null);
-        entity.setUsername(appUser.getCompanyName() == null ? null : appUser.getCompanyName());
         entity.setFriendIds(friendIds);
         List<AppUserDataVo> friendList = appUserMapper.selectList(entity);
         if (friendList == null || friendList.size() == 0) {
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 c10c7e0..fe42d26 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
@@ -182,13 +182,10 @@ 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}, '%')
-        </if>
-        <if test="username != null  and username != ''">
-            and a.username like concat('%', #{username}, '%')
-        </if>
-        <if test="schoolName != null  and schoolName != ''">
-            and s.name like concat('%', #{schoolName}, '%')
+            and (a.company_name like concat('%', #{companyName}, '%')
+                or a.username like concat('%', #{companyName}, '%')
+                or s.name like concat('%', #{companyName}, '%')
+            )
         </if>
         <if test="ids != null and ids.size()"> and a.id not in
             <foreach collection="ids" item="item" open="(" separator="," close=")">