住户监管柱状图

linwei

2024-01-25 3524bd78770d3dd16b8be3e4fa9cba06a42cefa0

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

@@ -10,8 +10,6 @@
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.district.entity.DistrictEntity;
import org.springblade.modules.district.service.IDistrictService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springframework.stereotype.Service;
@@ -40,6 +38,7 @@
      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()));
@@ -48,11 +47,13 @@
      }
      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(fieldValues);
//         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());
         if (regionChildCodesList.size() > 0) {
            article.setDistrictIdList(regionChildCodesList);
         }
      }
      return page.setRecords(baseMapper.selectArticlePage(page, article));
   }