投票人员查询优化

linwei

2024-02-22 7bcd0d2d7510cb2ba67099cd768e1b2b6d047dc2

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

@@ -6,14 +6,19 @@
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
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.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springframework.stereotype.Service;

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

@@ -37,20 +42,42 @@
   public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO 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("wygly") || userRole.contains("wyxmjl")) {
      //    // 物业公司 有哪些小区
      //    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("wygly") || userRole.contains("wyxmjl")) {
         // 查询小区id
         IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
         List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
         // 通过用户机构查询用户的物业公司
         IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
         PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
         if (one != null) {
            IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
            // 通过物业公司，查询小区
            List<PropertyCompanyDistrictEntity> list = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
               .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, one.getId()));
            if (list.size() > 0) {
               List<String> collect = list.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
               districtIds.addAll(collect);
            }
         }
         article.setDistrictIdList(districtIds);
         if (districtIds.size() == 0) {
            return page.setRecords(new ArrayList<>());
         }
         article.setPropertyFlag(1);
      }
      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);
         if (regionChildCodesList.size() > 0) {
            article.setDistrictIdList(regionChildCodesList);
         }
      }
      return page.setRecords(baseMapper.selectArticlePage(page, article));
   }
@@ -67,6 +94,7 @@
      // 查询用户小区的id
      String districId = baseMapper.getDistrictId(article.getHouseCode());
      article.setDistrictId(districId);
      article.setUserId(AuthUtil.getUserId());
      List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
      return page.setRecords(articleVOS);
   }