~

server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleCheckServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mdd.common.entity.AppUser;
+import com.mdd.common.mapper.AppUserMapper;
 import com.mdd.front.validate.common.PageValidate;
 import com.mdd.front.service.IAppCircleCheckService;
 import com.mdd.front.validate.AppCircleCheckCreateValidate;
@@ -35,6 +37,9 @@ public class AppCircleCheckServiceImpl implements IAppCircleCheckService {
     @Resource
     AppCircleCheckMapper appCircleCheckMapper;
 
+    @Resource
+    AppUserMapper appUserMapper;
+
     /**
      * 圈子用户审核信息列表
      *
@@ -66,6 +71,10 @@ public class AppCircleCheckServiceImpl implements IAppCircleCheckService {
             BeanUtils.copyProperties(item, vo);
             vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
             vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime()));
+
+            AppUser appUser = appUserMapper.selectById(item.getUserId());
+            vo.setAvatar(appUser.getAvatar());
+            vo.setUsername(appUser.getUsername());
             list.add(vo);
         }
 

server/like-front/src/main/java/com/mdd/front/service/impl/AppCircleUserServiceImpl.java

@@ -1,7 +1,6 @@
 package com.mdd.front.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.github.yulichang.query.MPJQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.mdd.common.entity.AppCircle;
@@ -13,13 +12,10 @@ import com.mdd.front.validate.AppCircleUserUpdateValidate;
 import com.mdd.front.validate.AppCircleUserSearchValidate;
 import com.mdd.front.vo.AppCircleUserListedVo;
 import com.mdd.front.vo.AppCircleUserDetailVo;
-import com.mdd.common.config.GlobalConfig;
 import com.mdd.common.core.PageResult;
 import com.mdd.common.entity.AppCircleUser;
 import com.mdd.common.mapper.AppCircleUserMapper;
-import com.mdd.common.util.ListUtils;
 import com.mdd.common.util.TimeUtils;
-import com.mdd.common.util.UrlUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.util.Assert;

server/like-front/src/main/java/com/mdd/front/service/impl/AppContentCommentServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mdd.common.entity.AppUser;
+import com.mdd.common.mapper.AppUserMapper;
 import com.mdd.front.validate.common.PageValidate;
 import com.mdd.front.service.IAppContentCommentService;
 import com.mdd.front.validate.AppContentCommentCreateValidate;
@@ -35,6 +37,9 @@ public class AppContentCommentServiceImpl implements IAppContentCommentService {
     @Resource
     AppContentCommentMapper appContentCommentMapper;
 
+    @Resource
+    AppUserMapper appUserMapper;
+
     /**
      * 圈子内容评论信息列表
      *
@@ -67,6 +72,9 @@ public class AppContentCommentServiceImpl implements IAppContentCommentService {
             BeanUtils.copyProperties(item, vo);
             vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
             vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime()));
+            AppUser appUser = appUserMapper.selectById(item.getUserId());
+            vo.setAvatar(appUser.getAvatar());
+            vo.setUsername(appUser.getUsername());
             list.add(vo);
         }
 

server/like-front/src/main/java/com/mdd/front/service/impl/AppContentGiftServiceImpl.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.yulichang.query.MPJQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mdd.common.entity.AppUser;
+import com.mdd.common.mapper.AppUserMapper;
 import com.mdd.front.validate.common.PageValidate;
 import com.mdd.front.service.IAppContentGiftService;
 import com.mdd.front.validate.AppContentGiftCreateValidate;
@@ -35,6 +37,9 @@ public class AppContentGiftServiceImpl implements IAppContentGiftService {
     @Resource
     AppContentGiftMapper appContentGiftMapper;
 
+    @Resource
+    AppUserMapper appUserMapper;
+
     /**
      * 圈子内容礼物信息列表
      *
@@ -68,6 +73,9 @@ public class AppContentGiftServiceImpl implements IAppContentGiftService {
             BeanUtils.copyProperties(item, vo);
             vo.setCreateTime(TimeUtils.timestampToDate(item.getCreateTime()));
             vo.setUpdateTime(TimeUtils.timestampToDate(item.getUpdateTime()));
+            AppUser appUser = appUserMapper.selectById(item.getUserId());
+            vo.setAvatar(appUser.getAvatar());
+            vo.setUsername(appUser.getUsername());
             list.add(vo);
         }
 

server/like-front/src/main/java/com/mdd/front/vo/AppCircleCheckListedVo.java

@@ -21,7 +21,7 @@ public class AppCircleCheckListedVo implements Serializable {
     @ApiModelProperty(value = "审核用户id")
     private Integer checkUser;
 
-    @ApiModelProperty(value = "点赞用户")
+    @ApiModelProperty(value = "申请用户")
     private Integer userId;
 
     @ApiModelProperty(value = "审核结果0待审核1通过2失败")
@@ -33,5 +33,11 @@ public class AppCircleCheckListedVo implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private String updateTime;
 
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "用户账号")
+    private String username;
+
 
 }

server/like-front/src/main/java/com/mdd/front/vo/AppContentCommentListedVo.java

@@ -33,5 +33,11 @@ public class AppContentCommentListedVo implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private String updateTime;
 
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "用户账号")
+    private String username;
+
 
 }

server/like-front/src/main/java/com/mdd/front/vo/AppContentGiftListedVo.java

@@ -39,5 +39,11 @@ public class AppContentGiftListedVo implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private String updateTime;
 
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "用户账号")
+    private String username;
+
 
 }

server/like-front/src/main/java/com/mdd/front/vo/AppSosCheckListedVo.java

@@ -39,5 +39,11 @@ public class AppSosCheckListedVo implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private String updateTime;
 
+    @ApiModelProperty(value = "头像")
+    private String avatar;
+
+    @ApiModelProperty(value = "用户账号")
+    private String username;
+
 
 }