wyh
/
gan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

~

main
linhw 2024-06-17 11:04:05 +08:00
parent 297a16847b
commit 24466fae70
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java
View File

@ -62,6 +62,8 @@ public class AppUser extends BaseEntity
private String schoolName; private String schoolName;
private String search;
/** 专业 */ /** 专业 */
@Excel(name = "专业") @Excel(name = "专业")
private String major; private String major;

3
gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
View File

@ -275,7 +275,6 @@ public class AppUserServiceImpl implements IAppUserService {
entity.setIsMember(appUser.getIsMember()); entity.setIsMember(appUser.getIsMember());
entity.setAppId(appUser.getAppId()); entity.setAppId(appUser.getAppId());
entity.setSchool(appUser.getSchool()); entity.setSchool(appUser.getSchool());
entity.setCompanyName(appUser.getCompanyName());
// 学校 // 学校
List<AppUserDataVo> schoolList = appUserMapper.selectList(entity); List<AppUserDataVo> schoolList = appUserMapper.selectList(entity);
Collections.shuffle(schoolList); Collections.shuffle(schoolList);
@ -286,6 +285,7 @@ public class AppUserServiceImpl implements IAppUserService {
entity.setSchool(null); entity.setSchool(null);
entity.setCompanyName(appUser.getCompanyName());
// 公司 // 公司
List<AppUserDataVo> companylList = appUserMapper.selectList(entity); List<AppUserDataVo> companylList = appUserMapper.selectList(entity);
Collections.shuffle(companylList); Collections.shuffle(companylList);
@ -297,6 +297,7 @@ public class AppUserServiceImpl implements IAppUserService {
// 好友的好友 // 好友的好友
List<Long> friendIds = appUserFriendMapper.selectByFriendId(ids); List<Long> friendIds = appUserFriendMapper.selectByFriendId(ids);
entity.setFriendIds(friendIds); entity.setFriendIds(friendIds);
entity.setCompanyName(null);
List<AppUserDataVo> friendList = appUserMapper.selectList(entity); List<AppUserDataVo> friendList = appUserMapper.selectList(entity);
if (friendList == null || friendList.size() == 0) { if (friendList == null || friendList.size() == 0) {
entity.setFriendIds(null); entity.setFriendIds(null);

13
gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
View File

@ -212,11 +212,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="appId != null "> and a.id != #{appId}</if> <if test="appId != null "> and a.id != #{appId}</if>
<if test="school != null and school != ''"> and a.school = #{school}</if> <if test="school != null and school != ''"> and a.school = #{school}</if>
<if test="companyName != null and companyName != ''"> <if test="companyName != null and companyName != ''">
and (a.company_name like concat('%', #{companyName}, '%') and a.company_name = #{companyName}
or a.username like concat('%', #{companyName}, '%') </if>
or a.nickname like concat('%', #{companyName}, '%') <if test="search != null and search != ''">
or a.major like concat('%', #{companyName}, '%') and (a.company_name like concat('%', #{search}, '%')
or s.name like concat('%', #{companyName}, '%') 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>
<if test="ids != null and ids.size()"> and a.id not in <if test="ids != null and ids.size()"> and a.id not in