diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java index a889068..6926973 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserDynamicVo.java @@ -58,6 +58,9 @@ public class AppUserDynamicVo extends AppUserDynamic private int countComment; + private String schoolName; + + // 是否会员;0是1否 private Integer isMember; diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java index 17ccb49..7e034ac 100644 --- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java +++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java @@ -174,6 +174,9 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService appUserCollect.setUserId(appUserDynamic.getAppId()); List appUserCollects = appUserCollectMapper.selectAppUserCollectList(appUserCollect); appUserDynamic.setIds(appUserCollects.stream().map(x->x.getDynamicId()).collect(Collectors.toList())); + if (appUserCollects.size() < 1) { + return new ArrayList<>(); + } } // 自己全部数据、公开数据、好友数据 diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml index ca11d3c..21a375d 100644 --- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml +++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml @@ -58,9 +58,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" t.name as "townName", p.name as "provinceName", u.`check` as "check", - u.nickname as "nickname" + u.nickname as "nickname", + s.name as "schoolName" from app_user_dynamic a left join app_user u on u.id = a.user_id + left join app_school s on s.id = u.school left join app_city c on c.id = a.city_id left join app_province p on p.id = a.province_id left join app_town t on t.id = a.town_id