租户查询调整

zhongrj

2024-02-21 051ccdbfdc1daec64187d28af1ca11e55649cd1e

租户查询调整

 src/main/java/org/springblade/common/param/CommonParamSet.java

@@ -57,7 +57,7 @@
                    communityCodeField.set(t,communityCode);
                }
            }
            isAdministrator = AuthUtil.isAdministrator() == true || AuthUtil.isAdmin() == true ? 1 : 2;
            isAdministrator = Strings.isBlank(roleName) && (AuthUtil.isAdministrator() == true || AuthUtil.isAdmin() == true) ? 1 : 2;
            if (isAdministrator==2) {
                // 获取当前用户的所属行政区划编号
                regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());

 src/main/java/org/springblade/modules/house/mapper/HouseRentalMapper.xml

@@ -61,13 +61,13 @@
                    <if test="vo.roleName=='wgy'">
                        <choose>
                            <when test="gridCodeList !=null and gridCodeList.size()>0">
                                and jp.grid_code in
                                and jh.grid_code in
                                <foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
                                    #{code}
                                </foreach>
                            </when>
                            <otherwise>
                                and jp.grid_code in ('')
                                and jh.grid_code in ('')
                            </otherwise>
                        </choose>
                    </if>

 src/main/java/org/springblade/modules/house/vo/HouseRentalTenantVO.java

@@ -60,5 +60,10 @@

    private Long userId;

    /**
     * 社区编号
     */
    private String communityCode;


}