议事议题优化

linwei

2024-02-23 33dc5038638f6b5e9f7f0b9165905e56797ec990

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

@@ -56,14 +56,14 @@
         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) {
         PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
         if (companyEntity != 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());
            List<PropertyCompanyDistrictEntity> propertyCompanyDistrictEntityList = bean2.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
               .eq(PropertyCompanyDistrictEntity::getPropertyCompanyId, companyEntity.getId()));
            if (propertyCompanyDistrictEntityList.size() > 0) {
               List<String> collect = propertyCompanyDistrictEntityList.stream().map(i -> i.getDistrictId()).collect(Collectors.toList());
               districtIds.addAll(collect);
            }
         }
@@ -71,6 +71,7 @@
         if (districtIds.size() == 0) {
            return page.setRecords(new ArrayList<>());
         }
         article.setPropertyFlag(1);
      }
      if (userRole.contains("jdgly")) {
         List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
@@ -93,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);
   }
@@ -168,4 +170,9 @@
      ArticleVO articleVO = baseMapper.getArticleOne(article);
      return articleVO;
   }

   @Override
   public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
      return baseMapper.getArticleByDistrictId(article);
   }
}