bug 修复

linwei

2024-01-19 494aeb58eb885b40ab2fdb083aaa79007bb79ae2

 src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java

@@ -1,12 +1,21 @@
package org.springblade.modules.article.service.impl;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.article.entity.Article;
import org.springblade.modules.article.mapper.ArticleMapper;
import org.springblade.modules.article.service.ArticleService;
import org.springblade.modules.article.vo.ArticleVO;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.stream.Collectors;

/**
 * @author zhongrj
@@ -16,74 +25,101 @@

public class ArticleServiceImpl extends ServiceImpl<ArticleMapper, Article> implements ArticleService {


   /**
    * 查询资讯分页信息
    *
    * @param page
    * @param article 资讯对象
    * @return
    */
   @Override
   public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
      return page.setRecords(baseMapper.selectArticlePage(page,article));
      String userRole = AuthUtil.getUserRole();
      // 物业身份，只查询该物业公司下的公告
      if (userRole.contains("wygly")) {
         IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
         List<PropertyCompanyDistrictEntity> list = bean.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
            .eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()));
         List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
         article.setDistrictIdList(collect);
      }
      if (userRole.contains("jdgly")) {
         List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
//         IDistrictService bean = SpringUtils.getBean(IDistrictService.class);
//         List<DistrictEntity> list = bean.list(Wrappers.<DistrictEntity>lambdaQuery()
//            .in(DistrictEntity::getCommunityCode, regionChildCodesList));
//         List<String> fieldValues = list.stream().map(DistrictEntity::getId).collect(Collectors.toList());
         article.setDistrictIdList(regionChildCodesList);
      }
      return page.setRecords(baseMapper.selectArticlePage(page, article));
   }

   /**
    * 查询资讯分页信息
    *
    * @param page
    * @param article 资讯对象
    * @return
    */
   @Override
   public IPage<ArticleVO> selectArticlePageByApp(IPage<ArticleVO> page, ArticleVO article) {
      return page.setRecords(baseMapper.selectArticlePageByApp(page,article));
      // 查询用户小区的id
      String districId = baseMapper.getDistrictId(article.getHouseCode());
      article.setDistrictId(districId);
      List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
      return page.setRecords(articleVOS);
   }

   @Override
   public IPage<Article> selectArticleG(IPage<Article> page, ArticleVO article) {
      return page.setRecords(baseMapper.selectArticleG(page,article));
      return page.setRecords(baseMapper.selectArticleG(page, article));
   }

   /**
    * 查询资讯分页信息(角色权限)
    *
    * @param page
    * @param article 资讯对象
    * @return
    */
   @Override
   public IPage<Article> pageDate(IPage<Article> page, ArticleVO article) {
      return page.setRecords(baseMapper.pageDate(page,article));
      return page.setRecords(baseMapper.pageDate(page, article));
   }

   /**
    * 查询资讯分页信息(敏感词预警)
    *
    * @param page
    * @param article 资讯对象
    * @return
    */
   @Override
   public IPage<Article> pageWords(IPage<Article> page, ArticleVO article) {
      return page.setRecords(baseMapper.pageWords(page,article));
      return page.setRecords(baseMapper.pageWords(page, article));
   }

   @Override
   public IPage<Article> pageCollectList(IPage<Article> page, ArticleVO article) {
      return page.setRecords(baseMapper.pageCollectList(page,article));
      return page.setRecords(baseMapper.pageCollectList(page, article));
   }

   /**
    * 查询资讯分页信息(角色权限)附带评论点赞数
    *
    * @param page
    * @param article 资讯对象
    * @return
    */
   @Override
   public IPage<Article> pageLikes(IPage<Article> page, ArticleVO article) {
      return page.setRecords(baseMapper.pageLikes(page,article));
      return page.setRecords(baseMapper.pageLikes(page, article));
   }

   @Override
   public IPage<Article> pageCollect(IPage<Article> page, ArticleVO article) {
      return page.setRecords(baseMapper.pageCollect(page,article));
      return page.setRecords(baseMapper.pageCollect(page, article));
   }

   /**
@@ -97,7 +133,12 @@
   }

   @Override
   public ArticleVO getArticleOne(Article article) {
   public ArticleVO getArticleOne(ArticleVO article) {
      if (article.getType() != null && article.getType().equals(4)) {
         article.setParentId("1740566650527752194");
      } else {
         article.setParentId("1722966265111248897");
      }
      ArticleVO articleVO = baseMapper.getArticleOne(article);
      return articleVO;
   }