Merge remote-tracking branch 'origin/master'

lin

2024-03-14 c4e2c196aad8af656d94bc47e9f1a80bc504b5d7

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

@@ -4,6 +4,7 @@
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.RoleUtil;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
@@ -50,7 +51,7 @@
      //    List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
      //    article.setDistrictIdList(collect);
      // }
      if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
      if (RoleUtil.isProperty(userRole)) {
         // 查询小区id
         IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
         List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
@@ -170,4 +171,12 @@
      ArticleVO articleVO = baseMapper.getArticleOne(article);
      return articleVO;
   }

   @Override
   public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
      List<String> objects = new ArrayList<>();
      objects.add(article.getDistrictId());
      article.setDistrictIdList(objects);
      return baseMapper.getArticleByDistrictId(article);
   }
}