Merge remote-tracking branch 'origin/master'

linwei

2024-02-22 9269fc94626bd9ed8c6c3d9e021d37b22d86a665

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

@@ -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);
   }