取消列表查询富文本字段

pz-system/src/main/java/com/pz/system/service/impl/ArticleServiceImpl.java

@@ -13,9 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.pz.common.helper.LoginHelper;
 import com.pz.common.helper.LoginHelper;
 import com.pz.common.utils.JsonUtils;
 import com.pz.common.utils.JsonUtils;
-import com.pz.system.domain.ArticleComment;
-import com.pz.system.domain.UserAppreciate;
-import com.pz.system.domain.UserCollect;
+import com.pz.system.domain.*;
 import com.pz.system.domain.bo.ArticleCommentBo;
 import com.pz.system.domain.bo.ArticleCommentBo;
 import com.pz.system.domain.bo.UserAppreciateBo;
 import com.pz.system.domain.bo.UserAppreciateBo;
 import com.pz.system.domain.bo.UserCollectBo;
 import com.pz.system.domain.bo.UserCollectBo;
@@ -26,7 +24,6 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import com.pz.system.domain.bo.ArticleBo;
 import com.pz.system.domain.bo.ArticleBo;
 import com.pz.system.domain.vo.ArticleVo;
 import com.pz.system.domain.vo.ArticleVo;
-import com.pz.system.domain.Article;
 import com.pz.system.service.IArticleService;
 import com.pz.system.service.IArticleService;
 
 
 import java.util.*;
 import java.util.*;
@@ -204,10 +201,12 @@ public class ArticleServiceImpl implements IArticleService {
                 bo.setArticleId(articleIds);
                 bo.setArticleId(articleIds);
                 bo.setCityId(null);
                 bo.setCityId(null);
                 lqw = buildQueryWrapper(bo);
                 lqw = buildQueryWrapper(bo);
+                lqw.select(Article.class, info -> !info.getColumn().equals("content"));
 
 
                 result = baseMapper.selectVoPage(pageQuery.build(), lqw);
                 result = baseMapper.selectVoPage(pageQuery.build(), lqw);
             }
             }
         } else if (bo.getIsCollect() == 0) {
         } else if (bo.getIsCollect() == 0) {
+            lqw.select(Article.class, info -> !info.getColumn().equals("content"));
             result = baseMapper.selectVoPage(pageQuery.build(), lqw);
             result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         }
         }
         Optional.ofNullable(result.getRecords()).ifPresent(articleVos -> {
         Optional.ofNullable(result.getRecords()).ifPresent(articleVos -> {
@@ -260,6 +259,13 @@ public class ArticleServiceImpl implements IArticleService {
                     // 设置收藏数
                     // 设置收藏数
                     articleVo.setCollectNum(collectNumMap.getOrDefault(articleVo.getId(), 0));
                     articleVo.setCollectNum(collectNumMap.getOrDefault(articleVo.getId(), 0));
 
 
+                    //是否点赞
+                    LambdaQueryWrapper<UserAppreciate> appreciateWrapper = Wrappers.<UserAppreciate>lambdaQuery()
+                    .eq(UserAppreciate::getAid, articleVo.getId());
+                    appreciateWrapper.eq(UserAppreciate::getUid, LoginHelper.getLoginUser().getUserId());
+                    boolean appreciated = userAppreciateMapper.selectCount(appreciateWrapper) != 0;
+                    articleVo.setAppreciate(appreciated);
+
                 });
                 });
             }
             }
         });
         });

pz-system/src/main/java/com/pz/system/service/impl/ServicesServiceImpl.java

@@ -54,6 +54,7 @@ public class ServicesServiceImpl implements IServicesService {
     @Override
     @Override
     public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
     public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
         LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
+        lqw.select(Services.class, info -> !info.getColumn().equals("info"));
         Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         /*result.getRecords().stream().findFirst().ifPresent(service -> {
         /*result.getRecords().stream().findFirst().ifPresent(service -> {
             noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2))
             noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2))