社区管理员过滤轮播图

lin

2024-04-15 7fc93d77272449952a7631ba50712fba52117826

社区管理员过滤轮播图

 src/main/java/org/springblade/common/utils/AuthUtils.java

@@ -38,6 +38,14 @@
    }

    /**
     * 街道、社区
     * @return
     */
    public static boolean isJd(String roleName) {
        return StringUtil.containsAny(roleName, new CharSequence[]{"jdgly","sqgly"});
    }

    /**
     * 是否超级或者管理员角色
     * @return
     */

 src/main/java/org/springblade/modules/rotation/entity/RotationEntity.java

@@ -56,7 +56,7 @@
    private String name;

    /** 类型 1：系统 2：社区 */
    @ApiModelProperty(value = "类型 1：系统 2：社区", example = "")
    @ApiModelProperty(value = "类型 3：系统 2：综治  1：公安", example = "")
    @TableField("type")
    private Integer type;


 src/main/java/org/springblade/modules/system/mapper/RegionMapper.xml

@@ -159,7 +159,20 @@
        jg.sort
        FROM jczz_grid jg
        left join blade_region br on br.village_code = jg.community_code and br.region_level = 5
        where jg.is_deleted = 0 and br.city_code = #{region.cityCode}
        where jg.is_deleted = 0 and jg.community_code like concat(#{region.cityCode},'%')
            <if test="isAdministrator==2">
                <choose>
                    <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
                        and jg.community_code in
                        <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
                            #{code}
                        </foreach>
                    </when>
                    <otherwise>
                        and 1=1
                    </otherwise>
                </choose>
            </if>
        union all
        </if>
        SELECT
@@ -169,7 +182,7 @@
        sort
        FROM blade_region
        where 1=1
        and district_code = '361102'
        and district_code like concat(#{region.districtCode},'%')
        <if test="region.parentCode!=null and region.parentCode!=''">
            and parent_code = #{region.parentCode}
        </if>

 src/main/java/org/springblade/modules/system/service/impl/RegionServiceImpl.java

@@ -152,11 +152,17 @@
            }
            // 综治的需要查到网格
            if (region.getDeptNature()==2){
                region.setCityCode("361100");
                region.setCityCode("361102");
                region.setDistrictCode("361102");
            }
            // 综治的需要查到网格
            if (region.getDeptNature()==3){
                region.setDistrictCode("361102");
            }
        }
        // 非公安
        return NodeTreeUtil.getStringNodeTree(baseMapper.getTreeList(region, regionChildCodesList, isAdministrator));
        Map<String, TreeStringNode> treeList = baseMapper.getTreeList(region, regionChildCodesList, isAdministrator);
        return NodeTreeUtil.getStringNodeTree(treeList);
    }

    /**

 src/main/java/org/springblade/modules/system/vo/RegionParamVO.java

@@ -43,6 +43,8 @@

    private String regionCode;

    private String districtCode;

    private List<Map<String, Object>> nineTypeStatistics;

    /**