lin
2024-03-22 1feb8ae4e9836426ef686847d7c30b7a9dea6437
小区查询文章支持多小区
2 files modified
12 ■■■■■ changed files
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java 9 ●●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java 3 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -20,6 +20,7 @@
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -57,7 +58,8 @@
            List<String> districtIds = propertyDistrictUserService.selectPropertyDistrictByUserId(AuthUtil.getUserId());
            // 通过用户机构查询用户的物业公司
            IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
            PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
            PropertyCompanyEntity companyEntity = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
                .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
            if (companyEntity != null) {
                IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
                // 通过物业公司,查询小区
@@ -174,9 +176,8 @@
    @Override
    public List<ArticleVO> getArticleByDistrictId(ArticleVO article) {
        List<String> objects = new ArrayList<>();
        objects.add(article.getDistrictId());
        article.setDistrictIdList(objects);
        List<String> stringList = Arrays.asList(article.getDistrictId().split(","));
        article.setDistrictIdList(stringList);
        return baseMapper.getArticleByDistrictId(article);
    }
}
src/main/java/org/springblade/modules/district/service/impl/DistrictServiceImpl.java
@@ -98,7 +98,8 @@
                // 通过用户机构查询用户的物业公司
                // 通过用户机构查询用户的物业公司
                IPropertyCompanyService bean = SpringUtil.getBean(IPropertyCompanyService.class);
                PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery().eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()));
                PropertyCompanyEntity one = bean.getOne(Wrappers.<PropertyCompanyEntity>lambdaQuery()
                    .eq(PropertyCompanyEntity::getDeptId, AuthUtil.getDeptId()).last("limit 1"));
                if (one != null) {
                    IPropertyCompanyDistrictService bean2 = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
                    // 通过物业公司,查询小区