linwei
2024-01-26 016e47ea961d84a186db0bbd45cd6d7eaaa57bc3
文章添加小区id 字段
3 files modified
53 ■■■■ changed files
src/main/java/org/springblade/modules/article/entity/Article.java 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml 4 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java 45 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/article/entity/Article.java
@@ -132,4 +132,8 @@
    @ApiModelProperty(value = "单元", example = "")
    @TableField("unit")
    private String unit;
    @ApiModelProperty(value = "小区id", example = "")
    @TableField("district_id")
    private String districtId;
}
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -213,6 +213,10 @@
            <foreach collection="article.districtIdList" separator=" or article_range like" item="id">'%${id}%'
            </foreach>
            )
            and district_id in
            <foreach collection="article.districtIdList" index="index" item="item" open="(" separator="," close=")">
                #{item}
            </foreach>
        </if>
        order by id desc
    </select>
src/main/java/org/springblade/modules/article/service/impl/ArticleServiceImpl.java
@@ -6,14 +6,19 @@
import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.article.entity.Article;
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.property.entity.PropertyCompanyDistrictEntity;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.property.service.IPropertyDistrictUserService;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -37,20 +42,38 @@
    public IPage<Article> selectArticlePage(IPage<Article> page, ArticleVO article) {
        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()));
            List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
            article.setDistrictIdList(collect);
        // if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
        //     // 物业公司 有哪些小区
        //     IPropertyCompanyDistrictService bean = SpringUtils.getBean(IPropertyCompanyDistrictService.class);
        //     List<PropertyCompanyDistrictEntity> list = bean.list(Wrappers.<PropertyCompanyDistrictEntity>lambdaQuery()
        //         .eq(PropertyCompanyDistrictEntity::getUserId, AuthUtil.getUserId()));
        //     List<String> collect = list.stream().map(PropertyCompanyDistrictEntity::getDistrictId).collect(Collectors.toList());
        //     article.setDistrictIdList(collect);
        // }
        if (userRole.contains("wygly") || userRole.contains("wyxmjl")) {
            // 查询小区id
            IPropertyDistrictUserService propertyDistrictUserService = SpringUtils.getBean(IPropertyDistrictUserService.class);
            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) {
                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());
                    districtIds.addAll(collect);
                }
            }
            article.setDistrictIdList(districtIds);
            if (districtIds.size() == 0) {
                return page.setRecords(new ArrayList<>());
            }
        }
        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());
            if (regionChildCodesList.size() > 0) {
                article.setDistrictIdList(regionChildCodesList);
            }