全部完成

yongqi-system/src/main/java/com/yongqi/system/service/SysLoginService.java

@@ -322,7 +322,7 @@ public class SysLoginService {
         LoginUser loginUser = new LoginUser();
         loginUser.setUserId(user.getUserId());
         loginUser.setDeptId(user.getDeptId());
-        loginUser.setUsername(user.getUserName());
+        loginUser.setUsername(user.getNickName());
         loginUser.setUserType(user.getUserType());
         loginUser.setMenuPermission(permissionService.getMenuPermission(user));
         loginUser.setRolePermission(permissionService.getRolePermission(user));

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbInviterVo.java

@@ -52,6 +52,8 @@ public class DbInviterVo {
      */
     @ExcelProperty(value = "状态：是否已计入折扣")
     private Integer status;
-
-
+    /**
+     * 用户头像
+     */
+    private String headImgUrl;
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbInviterMapper.java

 package com.yongqi.xinrenli.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yongqi.xinrenli.domain.DbInviter;
 import com.yongqi.xinrenli.domain.vo.DbInviterVo;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 邀请Mapper接口
@@ -13,4 +17,6 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
 public interface DbInviterMapper extends BaseMapperPlus<DbInviterMapper, DbInviter, DbInviterVo> {
 
     Integer InvitedCount(Long inviterId);
+
+    Page<DbInviterVo> selectVoPageList(@Param("page")Page<DbInviterVo> build, @Param(Constants.WRAPPER) LambdaQueryWrapper<DbInviter> lqw);
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbUserCommentMapper.java

@@ -11,6 +11,8 @@ import com.yongqi.xinrenli.domain.vo.DbUserCommentVo;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 用户评论Mapper接口
  *
@@ -22,4 +24,6 @@ public interface DbUserCommentMapper extends BaseMapperPlus<DbUserCommentMapper,
 
 
     Page<DbUserCommentVo> selectUserPage(Page<DbUserCommentVo> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<DbUserComment> queryWrapper);
+
+    List<DbUserCommentVo> selectVoPageList(@Param("id")Long id);
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbArticleServiceImpl.java

@@ -76,10 +76,8 @@ public class DbArticleServiceImpl implements IDbArticleService {
         pageQuery.setOrderByColumn("modifyTime");
         Page<DbArticleVo> result = baseMapper.selectPageList(pageQuery.build(), lqw);
         result.getRecords().forEach(record -> {
-            IPage<DbUserCommentVo> voPage = commentMapper.selectVoPage(new Page<DbUserComment>(0, 3), Wrappers.<DbUserComment>lambdaQuery()
-                .eq(DbUserComment::getArticleId, record.getId())
-                .eq(DbUserComment::getDeleteStatus, 0));
-            record.setCommentVos(voPage.getRecords());
+            List<DbUserCommentVo> voPage = commentMapper.selectVoPageList(record.getId());
+            record.setCommentVos(voPage);
             List<DbFileVo> dbFileVo = fileMapper.selectVoList(Wrappers.<DbFile>lambdaQuery()
                 .eq(DbFile::getServiceId, record.getId())
                 .eq(DbFile::getServiceType, FileEnumServiceType.ARTICLE.getServiceTyp())

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbInviterServiceImpl.java

@@ -52,7 +52,8 @@ public class DbInviterServiceImpl implements IDbInviterService {
     @Override
     public TableDataInfo<DbInviterVo> queryPageList(DbInviterBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<DbInviter> lqw = buildQueryWrapper(bo);
-        Page<DbInviterVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<DbInviterVo> result = baseMapper.selectVoPageList(pageQuery.build(), lqw);
+
         return TableDataInfo.build(result);
     }
 

yongqi-xinrenli/src/main/resources/mapper/DbInviterMapper.xml

@@ -4,15 +4,24 @@
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yongqi.xinrenli.mapper.DbInviterMapper">
 
-    <resultMap type="com.yongqi.xinrenli.domain.DbInviter" id="DbInviterResult">
+    <resultMap type="com.yongqi.xinrenli.domain.vo.DbInviterVo" id="DbInviterResult">
         <result property="id" column="id"/>
         <result property="inviterId" column="Inviter_id"/>
         <result property="inviterName" column="Inviter_name"/>
         <result property="inviteeId" column="Invitee_id"/>
         <result property="inviteeName" column="Invitee_name"/>
         <result property="status" column="status"/>
-        <result property="createTime" column="create_time"/>
+        <result property="headImgUrl" column="head_img_url"/>
     </resultMap>
 
+<select id="selectVoPageList" resultMap="DbInviterResult">
+    SELECT
+        i.*,
+        u.head_img_url
+    FROM
+        db_Inviter i
+            LEFT JOIN db_wx_user u ON i.Invitee_id = u.id
+            ${ew.getCustomSqlSegment}
+</select>
 
 </mapper>

yongqi-xinrenli/src/main/resources/mapper/DbUserCommentMapper.xml

@@ -28,4 +28,7 @@
     <select id="selectUserPage" resultMap="DbUserCommentVoResult">
         select c.*,w.nickname as userName from db_user_comment c INNER JOIN db_wx_user w on c.user_id=w.id ${ew.getCustomSqlSegment}
     </select>
+    <select id="selectVoPageList" resultMap="DbUserCommentVoResult" parameterType="java.lang.Long">
+        select uc.*,u.nickname as userName from db_user_comment uc LEFT JOIN db_wx_user u on uc.user_id=u.id where article_id=#{id} LIMIT 3
+    </select>
 </mapper>