Merge remote-tracking branch 'origin/master'

lin

2024-04-10 2d37fa5cf4ebf8bdcae40c5a9f63d561f307e2af

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

@@ -17,6 +17,8 @@
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.house.entity.HouseholdEntity;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
@@ -83,7 +85,7 @@
      }
      if (userRole.contains("jdgly")) {
         IDistrictService districtService = SpringUtils.getBean(IDistrictService.class);
         List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
         List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId(),null);
         List<DistrictEntity> list = districtService.list(Wrappers.<DistrictEntity>lambdaQuery().in(DistrictEntity::getCommunityCode, regionChildCodesList));
         if (list.size() > 0) {
            article.setDistrictIdList(list.stream().map(item -> item.getId()).collect(Collectors.toList()));
@@ -104,7 +106,16 @@
      // 查询用户小区的id
      String districId = baseMapper.getDistrictId(article.getHouseCode());
      article.setDistrictId(districId);
      article.setUserId(AuthUtil.getUserId());

      IHouseholdService householdService = SpringUtils.getBean(IHouseholdService.class);
      HouseholdEntity householdEntity = householdService.getOne(Wrappers.<HouseholdEntity>lambdaQuery()
         .eq(HouseholdEntity::getHouseCode, article.getHouseCode())
         .eq(HouseholdEntity::getAssociatedUserId,AuthUtil.getUserId())
         .eq(HouseholdEntity::getIsDeleted,0)
         .last("limit 1"));
      if (householdEntity != null) {
         article.setHouseholdId(householdEntity.getId());
      }
      List<ArticleVO> articleVOS = baseMapper.selectArticlePageByApp(page, article);
      return page.setRecords(articleVOS);
   }
@@ -215,4 +226,22 @@
      // 返回
      return update;
   }

   /**
    * 查询所有文章数据
    * @return
    */
   @Override
   public List<Article> getAllList(int i,int size) {
      return baseMapper.getAllList(i,size);
   }

   /**
    * 查询所有文章数据总数
    * @return
    */
   @Override
   public int getAllListTotal() {
      return baseMapper.getAllListTotal();
   }
}